makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11628] Set admin namespace in the constructor

Browse source 
PHPBB3-11628
This commit is contained in:
Nathaniel Guse 2013-07-24 13:04:27 -05:00
parent 67627f3336
commit 4414278209
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/phpbb/template/twig/twig.php
View file

@ -43,12 +43,6 @@ class phpbb_template_twig implements phpbb_template
*/ */
protected $phpbb_root_path; protected $phpbb_root_path;
/**
* adm relative path
* @var string
*/
protected $adm_relative_path;
/** /**
* PHP file extension * PHP file extension
* @var string * @var string
@ -102,7 +96,6 @@ class phpbb_template_twig implements phpbb_template
public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null) public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->adm_relative_path = $adm_relative_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
$this->config = $config; $this->config = $config;
$this->user = $user; $this->user = $user;
@ -137,6 +130,12 @@ class phpbb_template_twig implements phpbb_template
$lexer = new phpbb_template_twig_lexer($this->twig); $lexer = new phpbb_template_twig_lexer($this->twig);
$this->twig->setLexer($lexer); $this->twig->setLexer($lexer);
// Add admin namespace
if ($adm_relative_path !== null && is_dir($this->phpbb_root_path . $adm_relative_path . 'style/'))
{
$this->twig->getLoader()->setPaths($this->phpbb_root_path . $adm_relative_path . 'style/', 'admin');
}
} }
/** /**
@ -277,12 +276,6 @@ class phpbb_template_twig implements phpbb_template
// Set as __main__ namespace // Set as __main__ namespace
$this->twig->getLoader()->setPaths($style_paths); $this->twig->getLoader()->setPaths($style_paths);
// Add admin namespace
if (is_dir($this->phpbb_root_path . $this->adm_relative_path . 'style/'))
{
$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->adm_relative_path . 'style/', 'admin');
}
// Add all namespaces for all extensions // Add all namespaces for all extensions
if ($this->extension_manager instanceof phpbb_extension_manager) if ($this->extension_manager instanceof phpbb_extension_manager)
{ {