diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 11:49:06 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 11:49:06 -0400 |
| commit | 3be753cd5c64b80569f9c1189b39e8e47c248d89 (patch) | |
| tree | 63b392d152edcd9763fdc455a3743c1c5cb6f1e1 /phpBB/includes/template/twig/node | |
| parent | fab7f5fdfd2fd8ec50dae52dfde80a706015dd74 (diff) | |
| parent | d879acb7cca1a05a9adacc2376ab4118bd81ab4a (diff) | |
| download | forums-3be753cd5c64b80569f9c1189b39e8e47c248d89.tar forums-3be753cd5c64b80569f9c1189b39e8e47c248d89.tar.gz forums-3be753cd5c64b80569f9c1189b39e8e47c248d89.tar.bz2 forums-3be753cd5c64b80569f9c1189b39e8e47c248d89.tar.xz forums-3be753cd5c64b80569f9c1189b39e8e47c248d89.zip | |
Merge branch 'develop' into ticket/11215
* develop:
[ticket/11647] Always use & for URLs
[ticket/11647] Allow custom ports
[ticket/11647] Use $config for assets_version
[ticket/11647] Fix invalid variable name
[ticket/11647] New assets handling
[ticket/11647] Fix tests for INCLUDEJS
Diffstat (limited to 'phpBB/includes/template/twig/node')
| -rw-r--r-- | phpBB/includes/template/twig/node/includeasset.php | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php index 5abff10e3f..ae113cadc8 100644 --- a/phpBB/includes/template/twig/node/includeasset.php +++ b/phpBB/includes/template/twig/node/includeasset.php @@ -33,26 +33,21 @@ class phpbb_template_twig_node_includeasset extends Twig_Node ->write("\$asset_file = ") ->subcompile($this->getNode('expr')) ->raw(";\n") - ->write("\$argument_string = \$anchor_string = '';\n") - ->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n") + ->write("\$asset = new phpbb_template_asset(\$asset_file);\n") + ->write("if (\$asset->is_relative()) {\n") ->indent() - ->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n") - ->write("\$asset_file = substr(\$asset_file, 0, \$argument_string_start);\n") - ->write("if ((\$anchor_string_start = strpos(\$argument_string, '#')) !== false) {\n") + ->write("\$asset_path = \$asset->get_path();") + ->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n") + ->write("if (!file_exists(\$local_file)) {\n") ->indent() - ->write("\$anchor_string = substr(\$argument_string, \$anchor_string_start);\n") - ->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n") + ->write("\$local_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_path);\n") + ->write("\$asset->set_path(\$local_file, true);\n") ->outdent() + ->write("\$asset->add_assets_version({$config['assets_version']});\n") + ->write("\$asset_file = \$asset->get_url();\n") ->write("}\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") ->write("\$context['definition']->append('{$this->get_definition_name()}', '") ; |