diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-30 10:04:35 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-30 10:04:35 +0100 |
| commit | 739081b0459fd0c52d5f4a3fd1348c1f5566bc95 (patch) | |
| tree | 39cf9edda19cfd8f74b1589e804df8295bd45eb0 | |
| parent | 1f8f1b62866a51c8b728915fd8de6614c0ed4b0d (diff) | |
| parent | 3489780faaa6da87e41f855cecff98c00538542f (diff) | |
| download | forums-739081b0459fd0c52d5f4a3fd1348c1f5566bc95.tar forums-739081b0459fd0c52d5f4a3fd1348c1f5566bc95.tar.gz forums-739081b0459fd0c52d5f4a3fd1348c1f5566bc95.tar.bz2 forums-739081b0459fd0c52d5f4a3fd1348c1f5566bc95.tar.xz forums-739081b0459fd0c52d5f4a3fd1348c1f5566bc95.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/phpbb/template/context.php | 8 |
1 files changed, 4 insertions, 4 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; } |