upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 28

fix: Remove multiple require_once calls for template functions

Browse source 
Only require them when include the template file instead

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-03-11 11:01:20 +01:00 committed by Côme Chilliet
parent a78d86e91d
commit a83cae1a0e
4 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/Template/Base.php
View file

@ -136,6 +136,7 @@ class Base {
// Include
ob_start();
try {
require_once __DIR__ . '/../legacy/template/functions.php';
include $file;
$data = ob_get_contents();
} catch (\Exception $e) {

2
lib/private/Template/Template.php
View file

@ -21,8 +21,6 @@ use OCP\Template\ITemplate;
use OCP\Template\TemplateNotFoundException;
use OCP\Util;
require_once __DIR__ . '/../legacy/template/functions.php';
class Template extends Base implements ITemplate {
private string $path;
private array $headers = [];

2
lib/private/legacy/OC_Template.php
View file

@ -8,8 +8,6 @@
use OCP\Server;
use OCP\Template\ITemplateManager;
require_once __DIR__ . '/template/functions.php';
/**
* This class provides the templates for ownCloud.
* @deprecated 32.0.0 Use \OCP\Template\ITemplateManager instead

2
tests/lib/TestCase.php
View file

@ -549,8 +549,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
* @param array $vars
*/
protected function assertTemplate($expectedHtml, $template, $vars = []) {
require_once __DIR__ . '/../../lib/private/legacy/template/functions.php';
$requestToken = 12345;
/** @var Defaults|\PHPUnit\Framework\MockObject\MockObject $l10n */
$theme = $this->getMockBuilder('\OCP\Defaults')