3 files changed, 38 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php
index 6044effa1f..5bce79fd85 100644
--- a/phpBB/phpbb/template/base.php
+++ b/phpBB/phpbb/template/base.php
@@ -113,6 +113,16 @@ abstract class base implements template
 	/**
 	* {@inheritdoc}
 	*/
+	public function assign_block_vars_array($blockname, array $block_vars_array)
+	{
+		$this->context->assign_block_vars_array($blockname, $block_vars_array);
+
+		return $this;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
 	{
 		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 65c7d094a0..a222fbb69e 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -155,11 +155,12 @@ class 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
@@ -186,11 +187,12 @@ class 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;
 			}
 		}
 
@@ -198,6 +200,22 @@ class 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:
diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php
index d95b0a822c..87ae7a9766 100644
--- a/phpBB/phpbb/template/template.php
+++ b/phpBB/phpbb/template/template.php
@@ -132,6 +132,14 @@ interface template
 	public function assign_block_vars($blockname, array $vararray);
 
 	/**
+	* 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
+	* @return \phpbb\template\template $this
+	*/
+	public function assign_block_vars_array($blockname, array $block_vars_array);
+
+	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
 	* An example of how to use this function: