diff options
Diffstat (limited to 'phpBB/includes/template.php')
| -rw-r--r-- | phpBB/includes/template.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 3d9d4fec72..a67de99e03 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -294,10 +294,11 @@ class template $str = &$str[sizeof($str) - 1]; } - $vararray['S_ROW_COUNT'] = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0; + $s_row_count = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0; + $vararray['S_ROW_COUNT'] = $s_row_count; // Assign S_FIRST_ROW - if (!isset($str[$blocks[$blockcount]]) || sizeof($str[$blocks[$blockcount]]) == 0) + if (!$s_row_count) { $vararray['S_FIRST_ROW'] = true; } @@ -305,9 +306,9 @@ class template // Now the tricky part, we always assign S_LAST_ROW and remove the entry before // This is much more clever than going through the complete template data on display (phew) $vararray['S_LAST_ROW'] = true; - if (isset($str[$blocks[$blockcount]]) && sizeof($str[$blocks[$blockcount]]) > 0) + if ($s_row_count > 0) { - unset($str[$blocks[$blockcount]][sizeof($str[$blocks[$blockcount]]) - 1]['S_LAST_ROW']); + unset($str[$blocks[$blockcount]][($s_row_count - 1)]['S_LAST_ROW']); } // Now we add the block that we're actually assigning to. @@ -318,19 +319,20 @@ class template else { // Top-level block. - $vararray['S_ROW_COUNT'] = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0; + $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0; + $vararray['S_ROW_COUNT'] = $s_row_count; // Assign S_FIRST_ROW - if (!isset($this->_tpldata[$blockname]) || sizeof($this->_tpldata[$blockname]) == 0) + if (!$s_row_count) { $vararray['S_FIRST_ROW'] = true; } // We always assign S_LAST_ROW and remove the entry before $vararray['S_LAST_ROW'] = true; - if (isset($this->_tpldata[$blockname]) && sizeof($this->_tpldata[$blockname]) > 0) + if ($s_row_count > 0) { - unset($this->_tpldata[$blockname][sizeof($this->_tpldata[$blockname]) - 1]['S_LAST_ROW']); + unset($this->_tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']); } // Add a new iteration to this block with the variable assignments |