diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-01 09:36:03 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-01 09:38:51 -0500 |
| commit | 8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3 (patch) | |
| tree | f335ce2dd888e28f6112876e237a2a6014ae2568 /phpBB | |
| parent | 97494051290f394f61767358a306c1896d0545f0 (diff) | |
| download | forums-8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3.tar forums-8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3.tar.gz forums-8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3.tar.bz2 forums-8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3.tar.xz forums-8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3.zip | |
[feature/twig] Remove the get_rootref and get_tpldata functions prev added
These are not really necessary
PHPBB3-11598
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/template/context.php | 20 | ||||
| -rw-r--r-- | phpBB/includes/template/twig/twig.php | 7 |
2 files changed, 3 insertions, 24 deletions
diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php index 4689cf2d77..498568e5f4 100644 --- a/phpBB/includes/template/context.php +++ b/phpBB/includes/template/context.php @@ -83,26 +83,6 @@ class phpbb_template_context } /** - * 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. * * This function is public so that template renderer may invoke it. diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php index f5879c6027..717213ea1f 100644 --- a/phpBB/includes/template/twig/twig.php +++ b/phpBB/includes/template/twig/twig.php @@ -432,12 +432,11 @@ class phpbb_template_twig implements phpbb_template */ public function get_template_vars() { - $vars = array(); + $context_vars = $this->context->get_data_ref(); $vars = array_merge( - $vars, - $this->context->get_rootref(), - $this->context->get_tpldata(), + $context_vars['.'][0], // To get normal vars + $context_vars, // To get loops array( 'definition' => new phpbb_template_twig_definition(), 'user' => $this->user, |