From f8fbe3793680af1dae2db2829cfc84068831c52f Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 28 Jun 2017 00:58:03 +0700 Subject: [ticket/14972] replace all occurrences of sizeof() with the count() PHPBB3-14972 --- phpBB/phpbb/template/twig/extension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/template/twig') diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index f0e716d697..1aa7717470 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -146,7 +146,7 @@ class extension extends \Twig_Extension // of items to grab (length) // Start must always be the actual starting number for this calculation (not negative) - $start = ($start < 0) ? sizeof($item) + $start : $start; + $start = ($start < 0) ? count($item) + $start : $start; $end = $end - $start; } -- cgit v1.2.1 From 52f5e54d8a2a328123485272f18917199e06ec30 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 18 Jun 2018 11:54:47 +0200 Subject: [ticket/15666] Fix array key in twig lang() call PHPBB3-15666 --- phpBB/phpbb/template/twig/extension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/template/twig') diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 1aa7717470..f6f8e03ca2 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -172,7 +172,7 @@ class extension extends \Twig_Extension $context_vars = $this->context->get_root_ref(); - if (isset($context_vars['L_' . $key])) + if (is_string($key) && isset($context_vars['L_' . $key])) { return $context_vars['L_' . $key]; } -- cgit v1.2.1 From 5d4fccd235072b299fba0920e464a1a43fc0b91d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Oct 2018 16:07:48 +0100 Subject: [ticket/15542] Always append assets versions to assets PHPBB3-15542 --- phpBB/phpbb/template/twig/node/includeasset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/template/twig') diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index 6d50eafc9d..27ac2e6aa2 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -50,9 +50,9 @@ abstract class includeasset extends \Twig_Node ->write("\$asset->set_path(\$local_file, true);\n") ->outdent() ->write("}\n") - ->write("\$asset->add_assets_version('{$config['assets_version']}');\n") ->outdent() ->write("}\n") + ->write("\$asset->add_assets_version('{$config['assets_version']}');\n") ->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);") ; } -- cgit v1.2.1 From 11ae11a1562649b5d7870928a3281861c9ea39db Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Oct 2018 22:57:53 +0100 Subject: [ticket/15542] Only add assets version for relative paths PHPBB3-15542 --- phpBB/phpbb/template/twig/node/includeasset.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/phpbb/template/twig') diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index 27ac2e6aa2..12034b7820 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -52,7 +52,12 @@ abstract class includeasset extends \Twig_Node ->write("}\n") ->outdent() ->write("}\n") + ->write("\n") + ->write("if (\$asset->is_relative()) {\n") + ->indent() ->write("\$asset->add_assets_version('{$config['assets_version']}');\n") + ->outdent() + ->write("}\n") ->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);") ; } -- cgit v1.2.1