From 6d709525c318bcc6fa4a25aeb6a2a9d1256a9917 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Wed, 26 Jun 2013 12:27:32 -0500 Subject: [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter) PHPBB3-11598 --- phpBB/includes/template/context.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php index 98b870adec..9826f5e5f5 100644 --- a/phpBB/includes/template/context.php +++ b/phpBB/includes/template/context.php @@ -158,7 +158,7 @@ class phpbb_template_context } $s_row_count = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0; - $vararray['S_ROW_COUNT'] = $s_row_count; + $vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count; // Assign S_FIRST_ROW if (!$s_row_count) @@ -183,7 +183,7 @@ class phpbb_template_context { // Top-level block. $s_row_count = (isset($this->tpldata[$blockname])) ? sizeof($this->tpldata[$blockname]) : 0; - $vararray['S_ROW_COUNT'] = $s_row_count; + $vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count; // Assign S_FIRST_ROW if (!$s_row_count) @@ -323,12 +323,12 @@ class phpbb_template_context { $block[$i] = $block[$i-1]; - $block[$i]['S_ROW_COUNT'] = $i; + $block[$i]['S_ROW_COUNT'] = $block[$i]['S_ROW_NUM'] = $i; } // Insert vararray at given position $block[$key] = $vararray; - $block[$key]['S_ROW_COUNT'] = $key; + $block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key; return true; } -- cgit v1.2.1