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

[feature/twig] Remove the get_rootref and get_tpldata functions prev added

Browse source 
These are not really necessary

PHPBB3-11598
This commit is contained in:
Nathaniel Guse 2013-07-01 09:36:03 -05:00
parent 9749405129
commit 8d3fd1fcdd
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/template/context.php
View file

@ -82,26 +82,6 @@ class phpbb_template_context
return true; return true;
} }
/**
* Get (non-referenced) rootref
*
* @return array
*/
public function get_rootref()
{
return $this->rootref;
}
/**
* Get (non-referenced) tpldata
*
* @return array
*/
public function get_tpldata()
{
return $this->tpldata;
}
/** /**
* Returns a reference to template data array. * Returns a reference to template data array.
* *

7
phpBB/includes/template/twig/twig.php
View file

@ -432,12 +432,11 @@ class phpbb_template_twig implements phpbb_template
*/ */
public function get_template_vars() public function get_template_vars()
{ {
$vars = array(); $context_vars = $this->context->get_data_ref();
$vars = array_merge( $vars = array_merge(
$vars, $context_vars['.'][0], // To get normal vars
$this->context->get_rootref(), $context_vars, // To get loops
$this->context->get_tpldata(),
array( array(
'definition' => new phpbb_template_twig_definition(), 'definition' => new phpbb_template_twig_definition(),
'user' => $this->user, 'user' => $this->user,