diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-14 00:34:49 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-14 00:34:49 -0400 |
| commit | 9485eea0987478da25327a06a4fd36943ca1c01c (patch) | |
| tree | e6d9a9ebd48a9929b21d2ff8a70b70be049c52ac /phpBB/includes/template/twig/node/includeasset.php | |
| parent | e7b725369e962960943483d367f309be1cf45a69 (diff) | |
| parent | 6946cea72dae098599e1964c983d373bdd52324b (diff) | |
| download | forums-9485eea0987478da25327a06a4fd36943ca1c01c.tar forums-9485eea0987478da25327a06a4fd36943ca1c01c.tar.gz forums-9485eea0987478da25327a06a4fd36943ca1c01c.tar.bz2 forums-9485eea0987478da25327a06a4fd36943ca1c01c.tar.xz forums-9485eea0987478da25327a06a4fd36943ca1c01c.zip | |
Merge branch 'develop' into ticket/11215
* develop:
[ticket/11694] Do not locate assets with root path
Diffstat (limited to 'phpBB/includes/template/twig/node/includeasset.php')
| -rw-r--r-- | phpBB/includes/template/twig/node/includeasset.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php index ae113cadc8..990b1c984f 100644 --- a/phpBB/includes/template/twig/node/includeasset.php +++ b/phpBB/includes/template/twig/node/includeasset.php @@ -34,7 +34,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node ->subcompile($this->getNode('expr')) ->raw(";\n") ->write("\$asset = new phpbb_template_asset(\$asset_file);\n") - ->write("if (\$asset->is_relative()) {\n") + ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") ->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n") |