diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-15 16:42:02 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-15 16:42:02 -0500 |
| commit | 9e8babbf6eae65aa894cb0d8c4b452133ac344a8 (patch) | |
| tree | 9f43401a858c596cbebf19b750284e772c1c875a /phpBB/phpbb/template | |
| parent | b4a374dc73eda55db1c67b87bd65a73f79411ef5 (diff) | |
| download | forums-9e8babbf6eae65aa894cb0d8c4b452133ac344a8.tar forums-9e8babbf6eae65aa894cb0d8c4b452133ac344a8.tar.gz forums-9e8babbf6eae65aa894cb0d8c4b452133ac344a8.tar.bz2 forums-9e8babbf6eae65aa894cb0d8c4b452133ac344a8.tar.xz forums-9e8babbf6eae65aa894cb0d8c4b452133ac344a8.zip | |
[ticket/11832] get_url() from phpbb_template_asset should return web path
PHPBB3-11832
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 9 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includeasset.php | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 7c322cd971..2b10dd8848 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -19,13 +19,18 @@ class phpbb_template_asset { protected $components = array(); + /** @var phpbb_filesystem **/ + protected $phpbb_filesystem; + /** * Constructor * * @param string $url URL */ - public function __construct($url) + public function __construct($url, phpbb_filesystem $phpbb_filesystem) { + $this->phpbb_filesystem = $phpbb_filesystem; + $this->set_url($url); } @@ -112,7 +117,7 @@ class phpbb_template_asset */ public function get_url() { - return $this->join_url($this->components); + return $this->phpbb_filesystem->update_web_root_path($this->join_url($this->components)); } /** diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index 2dcd2003a3..8629395898 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -33,11 +33,11 @@ abstract class phpbb_template_twig_node_includeasset extends Twig_Node ->write("\$asset_file = ") ->subcompile($this->getNode('expr')) ->raw(";\n") - ->write("\$asset = new phpbb_template_asset(\$asset_file);\n") + ->write("\$asset = new phpbb_template_asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\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_web_root_path() . \$asset_path;\n") + ->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n") ->write("if (!file_exists(\$local_file)) {\n") ->indent() ->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n") |