diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 11:28:35 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 11:28:35 -0500 |
| commit | 947b907efef43704c620507db17aff4fe115f219 (patch) | |
| tree | 9eabcae6e2b6a585d3db0767f685379b60420e29 /phpBB/includes/template | |
| parent | abd4159f87db8db5030afc439f072d6aa7b715e3 (diff) | |
| download | forums-947b907efef43704c620507db17aff4fe115f219.tar forums-947b907efef43704c620507db17aff4fe115f219.tar.gz forums-947b907efef43704c620507db17aff4fe115f219.tar.bz2 forums-947b907efef43704c620507db17aff4fe115f219.tar.xz forums-947b907efef43704c620507db17aff4fe115f219.zip | |
[ticket/11388] Do not append assets_version if using remote path (e.g. http)
PHPBB3-11388
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/twig/node/includeasset.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php index 647ae22d81..5abff10e3f 100644 --- a/phpBB/includes/template/twig/node/includeasset.php +++ b/phpBB/includes/template/twig/node/includeasset.php @@ -33,8 +33,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node ->write("\$asset_file = ") ->subcompile($this->getNode('expr')) ->raw(";\n") - ->write("\$argument_string = '?assets_version={$config['assets_version']}';\n") - ->write("\$anchor_string = '';\n") + ->write("\$argument_string = \$anchor_string = '';\n") ->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n") ->indent() ->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n") @@ -45,12 +44,12 @@ class phpbb_template_twig_node_includeasset extends Twig_Node ->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n") ->outdent() ->write("}\n") - ->write("\$argument_string .= '&assets_version=" . $config['assets_version'] . "';\n") ->outdent() ->write("}\n") ->write("if (strpos(\$asset_file, '//') !== 0 && strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n") ->indent() ->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n") + ->write("\$argument_string .= ((\$argument_string) ? '&' : '?') . 'assets_version={$config['assets_version']}';\n") ->outdent() ->write("}\n") ->write("\$asset_file .= \$argument_string . \$anchor_string;\n") |