mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into ticket/11215

Browse Source 
* develop:
  [ticket/11694] Do not locate assets with root path
This commit is contained in:
David King
2013-07-14 00:34:49 -04:00
parent e7b725369e 6946cea72d
commit 9485eea098
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/template/twig/node/includeasset.php
View File

@@ -34,7 +34,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
->subcompile($this->getNode('expr')) ->subcompile($this->getNode('expr'))
->raw(";\n") ->raw(";\n")
->write("\$asset = new phpbb_template_asset(\$asset_file);\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() ->indent()
->write("\$asset_path = \$asset->get_path();") ->write("\$asset_path = \$asset->get_path();")
->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n") ->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")