From a83cae1a0e5b425c19375c126371ed606f689f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 11 Mar 2025 11:01:20 +0100 Subject: [PATCH] fix: Remove multiple require_once calls for template functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only require them when include the template file instead Signed-off-by: Côme Chilliet --- lib/private/Template/Base.php | 1 + lib/private/Template/Template.php | 2 -- lib/private/legacy/OC_Template.php | 2 -- tests/lib/TestCase.php | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/private/Template/Base.php b/lib/private/Template/Base.php index 0dd7d92d6be..55a765fad85 100644 --- a/lib/private/Template/Base.php +++ b/lib/private/Template/Base.php @@ -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) { diff --git a/lib/private/Template/Template.php b/lib/private/Template/Template.php index b69d68b944f..ee85562091f 100644 --- a/lib/private/Template/Template.php +++ b/lib/private/Template/Template.php @@ -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 = []; diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index 77b25477d31..bccf99af65e 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -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 diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index cfed2b06c61..918edf7150e 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -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')