From 2d9bbe0ef218f56565d70a0e197ba91a80ea378b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 13:26:00 -0500
Subject: [feature/twig] Fix template/context.php

PHPBB3-11598
---
 phpBB/includes/template/context.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/template')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 8585e7d794..e3ad6be46c 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -181,7 +181,7 @@ class phpbb_template_context
 			}
 
 			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blocks[$blockcount];
+			$vararray['S_BLOCK_NAME'] = $blockname;
 
 			// We always assign S_LAST_ROW and remove the entry before
 			$vararray['S_LAST_ROW'] = true;
@@ -196,7 +196,7 @@ class phpbb_template_context
 			// Set S_NUM_ROWS
 			foreach ($this->tpldata[$blockname] as &$mod_block)
 			{
-				$mod_block['S_NUM_ROWS'] = $blockcount;
+				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
 			}
 		}
 
-- 
cgit v1.2.1