diff options
| author | javiexin <javiexin@gmail.com> | 2017-02-15 23:56:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 23:56:52 +0100 |
| commit | 7f69580df3b6125941fc39d63f8498488f32231a (patch) | |
| tree | f7c3816515cdbe98aee078f8ece97d79f77bd017 /phpBB/phpbb/template | |
| parent | 7646280d518a4f637ec267fadb5e563f5b149512 (diff) | |
| parent | b567c6e2414d069ba54f7a924c952069aa115237 (diff) | |
| download | forums-7f69580df3b6125941fc39d63f8498488f32231a.tar forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.gz forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.bz2 forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.xz forums-7f69580df3b6125941fc39d63f8498488f32231a.zip | |
Merge branch '3.1.x' into ticket/15011
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/context.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/extension.php | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index 4ee48205c8..8bf6c10e2d 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -365,15 +365,15 @@ class context if ($mode == 'insert') { // Make sure we are not exceeding the last iteration - if ($key >= sizeof($this->tpldata[$blockname])) + if ($key >= sizeof($block)) { - $key = sizeof($this->tpldata[$blockname]); - unset($this->tpldata[$blockname][($key - 1)]['S_LAST_ROW']); + $key = sizeof($block); + unset($block[($key - 1)]['S_LAST_ROW']); $vararray['S_LAST_ROW'] = true; } else if ($key === 0) { - unset($this->tpldata[$blockname][0]['S_FIRST_ROW']); + unset($block[0]['S_FIRST_ROW']); $vararray['S_FIRST_ROW'] = true; } diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 3a983491b9..d5b14129b5 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -169,8 +169,7 @@ class extension extends \Twig_Extension $args = func_get_args(); $key = $args[0]; - $context = $this->context->get_data_ref(); - $context_vars = $context['.'][0]; + $context_vars = $this->context->get_root_ref(); if (isset($context_vars['L_' . $key])) { |