diff options
author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 16:21:02 -0700 |
---|---|---|
committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 16:21:02 -0700 |
commit | 179f41475b555d0a3314d779d0d7423f66f0fb95 (patch) | |
tree | 8664f91f4fa58765cc34333b248c34b75ab91758 /phpBB/phpbb/template/twig/node | |
parent | af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0 (diff) | |
parent | 213e7563ad4565b322680ce2f3526a7130d2a90e (diff) | |
download | forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.gz forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.bz2 forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.xz forums-179f41475b555d0a3314d779d0d7423f66f0fb95.zip |
Merge pull request #1735 from nickvergessen/ticket/11852
Ticket/11852 filesystem class must not depend on a web request
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();") |