aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-11-20 20:54:50 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-11-20 20:54:50 +0100
commit5179e4f93fb372a97a1e71f086c162310edd1b36 (patch)
tree319793ce43c3ce67fe71af7445d1e0d8c8942faa /phpBB/phpbb
parent6c5578a65b6cd357b567e81adf510e239aff40eb (diff)
parent11ae11a1562649b5d7870928a3281861c9ea39db (diff)
downloadforums-5179e4f93fb372a97a1e71f086c162310edd1b36.tar
forums-5179e4f93fb372a97a1e71f086c162310edd1b36.tar.gz
forums-5179e4f93fb372a97a1e71f086c162310edd1b36.tar.bz2
forums-5179e4f93fb372a97a1e71f086c162310edd1b36.tar.xz
forums-5179e4f93fb372a97a1e71f086c162310edd1b36.zip
Merge pull request #5433 from marc1706/ticket/15542
[ticket/15542] Always append assets versions to assets
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/template/twig/node/includeasset.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 6d50eafc9d..12034b7820 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -50,7 +50,12 @@ 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("\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);")