diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
| commit | 7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c (patch) | |
| tree | aceb567afda7467738ab6b693dc9595a40ac7f2f /phpBB/phpbb/template/twig/node | |
| parent | 93531e7fb0df7d9cd2de04ca06aa9eb6a847a1c4 (diff) | |
| parent | 49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (diff) | |
| download | forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.gz forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.bz2 forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.xz forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/phpbb/template/twig/node')
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includeasset.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index f15fd6296b..f6c9dc9c58 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -35,7 +35,7 @@ abstract class includeasset extends \Twig_Node ->write("\$asset_file = ") ->subcompile($this->getNode('expr')) ->raw(";\n") - ->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n") + ->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper());\n") ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") |