aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-24 12:34:22 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-24 12:34:22 -0500
commit85ff05bec635e8e6ef0fb64a561e2dd400b53897 (patch)
treee979821a89fd117d3a2b39e9fa3f319e3e3b5f9c /phpBB/phpbb/template/twig
parent5d1afb453211d42a8deacb66684c136385918192 (diff)
downloadforums-85ff05bec635e8e6ef0fb64a561e2dd400b53897.tar
forums-85ff05bec635e8e6ef0fb64a561e2dd400b53897.tar.gz
forums-85ff05bec635e8e6ef0fb64a561e2dd400b53897.tar.bz2
forums-85ff05bec635e8e6ef0fb64a561e2dd400b53897.tar.xz
forums-85ff05bec635e8e6ef0fb64a561e2dd400b53897.zip
[ticket/11628] Remove $this->names, $this->style_names from phpbb_template
These are not used anywhere PHPBB3-11628
Diffstat (limited to 'phpBB/phpbb/template/twig')
-rw-r--r--phpBB/phpbb/template/twig/twig.php19
1 files changed, 3 insertions, 16 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 92a52d26b8..4ae918ed86 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -75,16 +75,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
*
* @var 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);