mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00
Code Issues Releases Wiki Activity

[ticket/11832] get_url() from phpbb_template_asset should return web path

Browse Source 
PHPBB3-11832
This commit is contained in:
Nathan Guse 2013-09-15 16:42:02 -05:00
parent b4a374dc73
commit 9e8babbf6e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/template/asset.php
View File

@ -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));
}
/**

4
phpBB/phpbb/template/twig/node/includeasset.php
View File

@ -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")