diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-13 03:32:01 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-13 03:32:01 +0200 |
| commit | 790cc0c54f0f84235a556e4442c42d9d1d5f7195 (patch) | |
| tree | be60657cf39d33cf97c3386ca6f2bd2d885e8ede /phpBB/includes/style | |
| parent | 1828d74502c800acd9eb8b87438e628f59b10dad (diff) | |
| parent | 6ad58c7e046c9f257ad5441b7a583cddb213ad3f (diff) | |
| download | forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar.gz forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar.bz2 forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.tar.xz forums-790cc0c54f0f84235a556e4442c42d9d1d5f7195.zip | |
Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop
* github-callumacrae/ticket/10783:
[ticket/10783] Added assets_version to ACP and simple_*.html.
[ticket/10783] Added assets_version to subsilver2.
[ticket/10783] Added ?assets_version to assets.
Diffstat (limited to 'phpBB/includes/style')
| -rw-r--r-- | phpBB/includes/style/template_filter.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/style/template_filter.php b/phpBB/includes/style/template_filter.php index d62ad0ba1e..f9bbcce4b2 100644 --- a/phpBB/includes/style/template_filter.php +++ b/phpBB/includes/style/template_filter.php @@ -882,6 +882,8 @@ class phpbb_style_template_filter extends php_user_filter */ private function compile_tag_include_js($tag_args) { + global $config; + // Process dynamic includes if ($tag_args[0] == '{') { @@ -894,7 +896,7 @@ class phpbb_style_template_filter extends php_user_filter } // Locate file - $filename = $this->locator->get_first_file_location(array($tag_args), false, true); + $filename = $this->locator->get_first_file_location(array($tag_args), false, true) . '?assets_version=' . $config['assets_version']; if ($filename === false) { |