1 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index c5ce7422b9..263f77a1b8 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template;
+
 /**
 * @ignore
 */
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_template_context
+class context
 {
 	/**
 	* variable that holds all the data we'll be substituting into
@@ -86,7 +88,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.
 	*
@@ -158,7 +160,7 @@ class phpbb_template_context
 			}
 
 			// Now we add the block that we're actually assigning to.
-			// We're adding a new iteration to this block with the given
+			// We're adding a new \iteration to this block with the given
 			// variable assignments.
 			$str[$blocks[$blockcount]][] = $vararray;
 
@@ -190,7 +192,7 @@ class phpbb_template_context
 				unset($this->tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']);
 			}
 
-			// Add a new iteration to this block with the variable assignments we were given.
+			// Add a new \iteration to this block with the variable assignments we were given.
 			$this->tpldata[$blockname][] = $vararray;
 
 			// Set S_NUM_ROWS
@@ -223,7 +225,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)