mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 20:45:16 +02:00
Code Issues Releases Wiki Activity

[ticket/11628] Remove $this->names, $this->style_names from phpbb_template

Browse Source 
These are not used anywhere

PHPBB3-11628
This commit is contained in:
Nathaniel Guse
2013-07-24 12:34:22 -05:00
parent 5d1afb4532
commit 85ff05bec6
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,16 +74,6 @@ class phpbb_template_twig implements phpbb_template
*/
protected $extension_manager;
/**
* Name of the style that the template being compiled and/or rendered
* belongs to, and its parents, in inheritance tree order.
*
* Used to invoke style-specific template events.
*
* @var array
*/
protected $style_names;
/**
* Twig Environment
*
@ -206,12 +196,12 @@ class phpbb_template_twig implements phpbb_template
*/
public function set_style($style_directories = array('styles'))
{
$this->names = $this->get_user_style();
$names = $this->get_user_style();
$paths = array();
foreach ($style_directories as $directory)
{
foreach ($this->names as $name)
foreach ($names as $name)
{
$path = $this->get_style_path($name, $directory);
@ -228,7 +218,7 @@ class phpbb_template_twig implements phpbb_template
$new_paths[] = $path . '/template/';
}
$this->set_style_names($this->names, $new_paths, ($style_directories === array('styles')));
$this->set_style_names($names, $new_paths, ($style_directories === array('styles')));
return true;
}
@ -255,7 +245,6 @@ class phpbb_template_twig implements phpbb_template
{
$names = array($name);
}
$this->names = $names;
$new_paths = array();
foreach ($paths as $path)
@ -280,8 +269,6 @@ class phpbb_template_twig implements phpbb_template
*/
public function set_style_names(array $style_names, array $style_paths, $is_core = false)
{
$this->style_names = $style_names;
// Set as __main__ namespace
$this->twig->getLoader()->setPaths($style_paths);