diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-05 18:17:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-05 18:17:14 +0200 |
| commit | de687f32ed8df438cb798d98f1a5dda7a5ac76dc (patch) | |
| tree | 346e51469449521e40a25d875bcc3f7b8d7846f7 /phpBB/phpbb/template/twig/node/includeasset.php | |
| parent | ba53901ffb734995b42626a71a81a5abaa55f85d (diff) | |
| parent | 51376a43919cba7a5037edb7cc31f18b5950437b (diff) | |
| download | forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar.gz forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar.bz2 forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar.xz forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.zip | |
Merge pull request #3432 from Nicofuma/ticket/13638
[ticket/13638] Prepend the assets path phpbb root
Diffstat (limited to 'phpBB/phpbb/template/twig/node/includeasset.php')
| -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 15195a226b..324823b8d7 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -39,7 +39,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_path_helper());\n") + ->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper(), \$this->getEnvironment()->get_filesystem());\n") ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") |