Merge branch '3.2.x'

This commit is contained in:
Tristan Darricau 2016-12-30 10:06:29 +01:00
commit c12b4320eb

View file

@ -365,15 +365,15 @@ class context
if ($mode == 'insert') if ($mode == 'insert')
{ {
// Make sure we are not exceeding the last iteration // Make sure we are not exceeding the last iteration
if ($key >= sizeof($this->tpldata[$blockname])) if ($key >= sizeof($block))
{ {
$key = sizeof($this->tpldata[$blockname]); $key = sizeof($block);
unset($this->tpldata[$blockname][($key - 1)]['S_LAST_ROW']); unset($block[($key - 1)]['S_LAST_ROW']);
$vararray['S_LAST_ROW'] = true; $vararray['S_LAST_ROW'] = true;
} }
else if ($key === 0) else if ($key === 0)
{ {
unset($this->tpldata[$blockname][0]['S_FIRST_ROW']); unset($block[0]['S_FIRST_ROW']);
$vararray['S_FIRST_ROW'] = true; $vararray['S_FIRST_ROW'] = true;
} }