From 5d4fccd235072b299fba0920e464a1a43fc0b91d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Oct 2018 16:07:48 +0100 Subject: [PATCH 1/2] [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(-) 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);") ; } From 11ae11a1562649b5d7870928a3281861c9ea39db Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Oct 2018 22:57:53 +0100 Subject: [PATCH 2/2] [ticket/15542] Only add assets version for relative paths PHPBB3-15542 --- phpBB/phpbb/template/twig/node/includeasset.php | 5 +++++ 1 file changed, 5 insertions(+) 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);") ; }