1 files changed, 26 insertions, 14 deletions
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index c5ce7422b9..a222fbb69e 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -7,20 +7,14 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template;
 
 /**
 * Stores variables assigned to template.
 *
 * @package phpBB3
 */
-class phpbb_template_context
+class context
 {
 	/**
 	* variable that holds all the data we'll be substituting into
@@ -86,7 +80,7 @@ class phpbb_template_context
 	* Returns a reference to template data array.
 	*
 	* This function is public so that template renderer may invoke it.
-	* Users should alter template variables via functions in phpbb_template.
+	* Users should alter template variables via functions in \phpbb\template\template.
 	*
 	* Note: modifying returned array will affect data stored in the context.
 	*
@@ -161,11 +155,12 @@ class phpbb_template_context
 			// We're adding a new iteration to this block with the given
 			// variable assignments.
 			$str[$blocks[$blockcount]][] = $vararray;
+			$s_num_rows = sizeof($str[$blocks[$blockcount]]);
 
 			// Set S_NUM_ROWS
 			foreach ($str[$blocks[$blockcount]] as &$mod_block)
 			{
-				$mod_block['S_NUM_ROWS'] = sizeof($str[$blocks[$blockcount]]);
+				$mod_block['S_NUM_ROWS'] = $s_num_rows;
 			}
 		}
 		else
@@ -192,11 +187,12 @@ class phpbb_template_context
 
 			// Add a new iteration to this block with the variable assignments we were given.
 			$this->tpldata[$blockname][] = $vararray;
+			$s_num_rows = sizeof($this->tpldata[$blockname]);
 
 			// Set S_NUM_ROWS
 			foreach ($this->tpldata[$blockname] as &$mod_block)
 			{
-				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
+				$mod_block['S_NUM_ROWS'] = $s_num_rows;
 			}
 		}
 
@@ -204,6 +200,22 @@ class phpbb_template_context
 	}
 
 	/**
+	* Assign key variable pairs from an array to a whole specified block loop
+	*
+	* @param string $blockname Name of block to assign $block_vars_array to
+	* @param array $block_vars_array An array of hashes of variable name => value pairs
+	*/
+	public function assign_block_vars_array($blockname, array $block_vars_array)
+	{
+		foreach ($block_vars_array as $vararray)
+		{
+			$this->assign_block_vars($blockname, $vararray);
+		}
+
+		return true;
+	}
+
+	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
 	* An example of how to use this function:
@@ -223,7 +235,7 @@ class phpbb_template_context
 	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
 	*
 	*	If insert, the vararray is inserted at the given position (position counting from zero).
-	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
+	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new \value).
 	*
 	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
 	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
@@ -283,7 +295,7 @@ class phpbb_template_context
 			// Search array to get correct position
 			list($search_key, $search_value) = @each($key);
 
-			$key = NULL;
+			$key = null;
 			foreach ($block as $i => $val_ary)
 			{
 				if ($val_ary[$search_key] === $search_value)
@@ -294,7 +306,7 @@ class phpbb_template_context
 			}
 
 			// key/value pair not found
-			if ($key === NULL)
+			if ($key === null)
 			{
 				return false;
 			}