9 files changed, 218 insertions, 211 deletions
diff --git a/phpBB/config/profilefields.yml b/phpBB/config/profilefields.yml
index 486788df3b..2cecb80534 100644
--- a/phpBB/config/profilefields.yml
+++ b/phpBB/config/profilefields.yml
@@ -14,6 +14,7 @@ services:
         arguments:
             - @profilefields
             - @request
+            - @template
             - @user
         tags:
             - { name: profilefield.type }
@@ -23,6 +24,7 @@ services:
         arguments:
             - @profilefields
             - @request
+            - @template
             - @user
         tags:
             - { name: profilefield.type }
@@ -32,6 +34,7 @@ services:
         arguments:
             - @profilefields
             - @request
+            - @template
             - @user
         tags:
             - { name: profilefield.type }
@@ -40,6 +43,7 @@ services:
         class: \phpbb\profilefields\type\type_int
         arguments:
             - @request
+            - @template
             - @user
         tags:
             - { name: profilefield.type }
@@ -48,6 +52,7 @@ services:
         class: \phpbb\profilefields\type\type_string
         arguments:
             - @request
+            - @template
             - @user
         tags:
             - { name: profilefield.type }
@@ -56,6 +61,7 @@ services:
         class: \phpbb\profilefields\type\type_text
         arguments:
             - @request
+            - @template
             - @user
         tags:
             - { name: profilefield.type }
diff --git a/phpBB/phpbb/profilefields/profilefields.php b/phpBB/phpbb/profilefields/profilefields.php
index 9edefdcca5..ba0baa53f0 100644
--- a/phpBB/phpbb/profilefields/profilefields.php
+++ b/phpBB/phpbb/profilefields/profilefields.php
@@ -361,209 +361,6 @@ class profilefields
 	}
 
 	/**
-	* Get field value for registration/profile
-	* @access private
-	*/
-	function get_var($field_validation, &$profile_row, $default_value, $preview)
-	{
-		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
-		$user_ident = $profile_row['field_ident'];
-		// checkbox - set the value to "true" if it has been set to 1
-		if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2)
-		{
-			$value = (isset($_REQUEST[$profile_row['field_ident']]) && request_var($profile_row['field_ident'], $default_value) == 1) ? true : ((!isset($this->user->profile_fields[$user_ident]) || $preview) ? $default_value : $this->user->profile_fields[$user_ident]);
-		}
-		else if ($profile_row['field_type'] == FIELD_INT)
-		{
-			if (isset($_REQUEST[$profile_row['field_ident']]))
-			{
-				$value = ($this->request->variable($profile_row['field_ident'], '') === '') ? NULL : $this->request->variable($profile_row['field_ident'], $default_value);
-			}
-			else
-			{
-				if (!$preview && array_key_exists($user_ident, $this->user->profile_fields) && is_null($this->user->profile_fields[$user_ident]))
-				{
-					$value = NULL;
-				}
-				else if (!isset($this->user->profile_fields[$user_ident]) || $preview)
-				{
-					$value = $default_value;
-				}
-				else
-				{
-					$value = $this->user->profile_fields[$user_ident];
-				}
-			}
-
-			return (is_null($value) || $value === '') ? '' : (int) $value;
-		}
-		else
-		{
-			$value = (isset($_REQUEST[$profile_row['field_ident']])) ? request_var($profile_row['field_ident'], $default_value, true) : ((!isset($this->user->profile_fields[$user_ident]) || $preview) ? $default_value : $this->user->profile_fields[$user_ident]);
-
-			if (gettype($value) == 'string')
-			{
-				$value = utf8_normalize_nfc($value);
-			}
-		}
-
-		switch ($field_validation)
-		{
-			case 'int':
-				return (int) $value;
-			break;
-		}
-
-		return $value;
-	}
-
-	/**
-	* Process int-type
-	* @access private
-	*/
-	function generate_int($profile_row, $preview = false)
-	{
-		$profile_row['field_value'] = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
-		$this->template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process date-type
-	* @access private
-	*/
-	function generate_date($profile_row, $preview = false)
-	{
-		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
-		$user_ident = $profile_row['field_ident'];
-
-		$now = getdate();
-
-		if (!isset($_REQUEST[$profile_row['field_ident'] . '_day']))
-		{
-			if ($profile_row['field_default_value'] == 'now')
-			{
-				$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
-			}
-			list($day, $month, $year) = explode('-', ((!isset($this->user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $this->user->profile_fields[$user_ident]));
-		}
-		else
-		{
-			if ($preview && $profile_row['field_default_value'] == 'now')
-			{
-				$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
-				list($day, $month, $year) = explode('-', ((!isset($this->user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $this->user->profile_fields[$user_ident]));
-			}
-			else
-			{
-				$day = request_var($profile_row['field_ident'] . '_day', 0);
-				$month = request_var($profile_row['field_ident'] . '_month', 0);
-				$year = request_var($profile_row['field_ident'] . '_year', 0);
-			}
-		}
-
-		$profile_row['s_day_options'] = '<option value="0"' . ((!$day) ? ' selected="selected"' : '') . '>--</option>';
-		for ($i = 1; $i < 32; $i++)
-		{
-			$profile_row['s_day_options'] .= '<option value="' . $i . '"' . (($i == $day) ? ' selected="selected"' : '') . ">$i</option>";
-		}
-
-		$profile_row['s_month_options'] = '<option value="0"' . ((!$month) ? ' selected="selected"' : '') . '>--</option>';
-		for ($i = 1; $i < 13; $i++)
-		{
-			$profile_row['s_month_options'] .= '<option value="' . $i . '"' . (($i == $month) ? ' selected="selected"' : '') . ">$i</option>";
-		}
-
-		$profile_row['s_year_options'] = '<option value="0"' . ((!$year) ? ' selected="selected"' : '') . '>--</option>';
-		for ($i = $now['year'] - 100; $i <= $now['year'] + 100; $i++)
-		{
-			$profile_row['s_year_options'] .= '<option value="' . $i . '"' . (($i == $year) ? ' selected="selected"' : '') . ">$i</option>";
-		}
-		unset($now);
-
-		$profile_row['field_value'] = 0;
-		$this->template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process bool-type
-	* @access private
-	*/
-	function generate_bool($profile_row, $preview = false)
-	{
-		$value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
-
-		$profile_row['field_value'] = $value;
-		$this->template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-
-		if ($profile_row['field_length'] == 1)
-		{
-			if (!isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
-			{
-				$this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_BOOL, $preview);
-			}
-
-			foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)
-			{
-				$this->template->assign_block_vars('bool.options', array(
-					'OPTION_ID'	=> $option_id,
-					'CHECKED'	=> ($value == $option_id) ? ' checked="checked"' : '',
-					'VALUE'		=> $option_value)
-				);
-			}
-		}
-	}
-
-	/**
-	* Process string-type
-	* @access private
-	*/
-	function generate_string($profile_row, $preview = false)
-	{
-		$profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview);
-		$this->template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process text-type
-	* @access private
-	*/
-	function generate_text($profile_row, $preview = false)
-	{
-		$field_length = explode('|', $profile_row['field_length']);
-		$profile_row['field_rows'] = $field_length[0];
-		$profile_row['field_cols'] = $field_length[1];
-
-		$profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview);
-		$this->template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process dropdown-type
-	* @access private
-	*/
-	function generate_dropdown($profile_row, $preview = false)
-	{
-		$value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
-
-		if (!isset($this->options_lang[$profile_row['field_id']]) || !isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
-		{
-			$this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_DROPDOWN, $preview);
-		}
-
-		$profile_row['field_value'] = $value;
-		$this->template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-
-		foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)
-		{
-			$this->template->assign_block_vars('dropdown.options', array(
-				'OPTION_ID'	=> $option_id,
-				'SELECTED'	=> ($value == $option_id) ? ' selected="selected"' : '',
-				'VALUE'		=> $option_value)
-			);
-		}
-	}
-
-	/**
 	* Return Templated value/field. Possible values for $mode are:
 	* change == user is able to set/enter profile values; preview == just show the value
 	* @access private
@@ -584,8 +381,8 @@ class profilefields
 		}
 
 		// Assign template variables
-		$type_func = 'generate_' . $this->profile_types[$profile_row['field_type']];
-		$this->$type_func($profile_row, $preview);
+		$profile_field = $this->container->get('profilefields.type.' . $this->profile_types[$profile_row['field_type']]);
+		$profile_field->generate_field($profile_row, $preview);
 
 		// Return templated data
 		return $this->template->assign_display('cp_body');
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php
index c492e2bb81..ee75578a16 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -14,10 +14,11 @@ class type_bool implements type_interface
 	/**
 	*
 	*/
-	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\request\request $request, \phpbb\user $user)
+	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->profilefields = $profilefields;
 		$this->request = $request;
+		$this->template = $template;
 		$this->user = $user;
 	}
 
@@ -126,4 +127,45 @@ class type_bool implements type_interface
 			return $this->profilefields->options_lang[$field_id][$lang_id][(int) ($field_value) + 1];
 		}
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function generate_field($profile_row, $preview = false)
+	{
+		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
+		$field_ident = $profile_row['field_ident'];
+		$default_value = $profile_row['lang_default_value'];
+
+		$value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
+		// checkbox - set the value to "true" if it has been set to 1
+		if ($profile_row['field_length'] == 2)
+		{
+			$value = ($this->request->is_set($field_ident) && $this->request->variable($field_ident, $default_value) == 1) ? true : ((!isset($this->user->profile_fields[$field_ident]) || $preview) ? $default_value : $this->user->profile_fields[$field_ident]);
+		}
+		else
+		{
+			$value = ($this->request->is_set($field_ident)) ? $this->request->variable($field_ident, $default_value) : ((!isset($this->user->profile_fields[$field_ident]) || $preview) ? $default_value : $this->user->profile_fields[$field_ident]);
+		}
+
+		$profile_row['field_value'] = (int) $value;
+		$this->template->assign_block_vars('bool', array_change_key_case($profile_row, CASE_UPPER));
+
+		if ($profile_row['field_length'] == 1)
+		{
+			if (!isset($this->profilefields->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->profilefields->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
+			{
+				$this->profilefields->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_BOOL, $preview);
+			}
+
+			foreach ($this->profilefields->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)
+			{
+				$this->template->assign_block_vars('bool.options', array(
+					'OPTION_ID'	=> $option_id,
+					'CHECKED'	=> ($value == $option_id) ? ' checked="checked"' : '',
+					'VALUE'		=> $option_value)
+				);
+			}
+		}
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index 48fe651d17..36e82dabce 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -14,10 +14,11 @@ class type_date implements type_interface
 	/**
 	*
 	*/
-	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\request\request $request, \phpbb\user $user)
+	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->profilefields = $profilefields;
 		$this->request = $request;
+		$this->template = $template;
 		$this->user = $user;
 	}
 
@@ -155,4 +156,58 @@ class type_date implements type_interface
 
 		return $field_value;
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function generate_field($profile_row, $preview = false)
+	{
+		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
+
+		$now = getdate();
+
+		if (!$this->request->is_set($profile_row['field_ident'] . '_day'))
+		{
+			if ($profile_row['field_default_value'] == 'now')
+			{
+				$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
+			}
+			list($day, $month, $year) = explode('-', ((!isset($this->user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $this->user->profile_fields[$user_ident]));
+		}
+		else
+		{
+			if ($preview && $profile_row['field_default_value'] == 'now')
+			{
+				$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
+				list($day, $month, $year) = explode('-', ((!isset($this->user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $this->user->profile_fields[$user_ident]));
+			}
+			else
+			{
+				$day = $this->request->variable($profile_row['field_ident'] . '_day', 0);
+				$month = $this->request->variable($profile_row['field_ident'] . '_month', 0);
+				$year = $this->request->variable($profile_row['field_ident'] . '_year', 0);
+			}
+		}
+
+		$profile_row['s_day_options'] = '<option value="0"' . ((!$day) ? ' selected="selected"' : '') . '>--</option>';
+		for ($i = 1; $i < 32; $i++)
+		{
+			$profile_row['s_day_options'] .= '<option value="' . $i . '"' . (($i == $day) ? ' selected="selected"' : '') . ">$i</option>";
+		}
+
+		$profile_row['s_month_options'] = '<option value="0"' . ((!$month) ? ' selected="selected"' : '') . '>--</option>';
+		for ($i = 1; $i < 13; $i++)
+		{
+			$profile_row['s_month_options'] .= '<option value="' . $i . '"' . (($i == $month) ? ' selected="selected"' : '') . ">$i</option>";
+		}
+
+		$profile_row['s_year_options'] = '<option value="0"' . ((!$year) ? ' selected="selected"' : '') . '>--</option>';
+		for ($i = $now['year'] - 100; $i <= $now['year'] + 100; $i++)
+		{
+			$profile_row['s_year_options'] .= '<option value="' . $i . '"' . (($i == $year) ? ' selected="selected"' : '') . ">$i</option>";
+		}
+
+		$profile_row['field_value'] = 0;
+		$this->template->assign_block_vars('date', array_change_key_case($profile_row, CASE_UPPER));
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php
index 0b7ee88217..61fa8d7585 100644
--- a/phpBB/phpbb/profilefields/type/type_dropdown.php
+++ b/phpBB/phpbb/profilefields/type/type_dropdown.php
@@ -14,10 +14,11 @@ class type_dropdown implements type_interface
 	/**
 	*
 	*/
-	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\request\request $request, \phpbb\user $user)
+	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->profilefields = $profilefields;
 		$this->request = $request;
+		$this->template = $template;
 		$this->user = $user;
 	}
 
@@ -135,4 +136,33 @@ class type_dropdown implements type_interface
 
 		return $this->profilefields->options_lang[$field_id][$lang_id][$field_value];
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function generate_field($profile_row, $preview = false)
+	{
+		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
+		$field_ident = $profile_row['field_ident'];
+		$default_value = $profile_row['lang_default_value'];
+
+		$value = ($this->request->is_set($field_ident)) ? $this->request->variable($field_ident, $default_value) : ((!isset($this->user->profile_fields[$field_ident]) || $preview) ? $default_value : $this->user->profile_fields[$field_ident]);
+
+		if (!isset($this->profilefields->options_lang[$profile_row['field_id']]) || !isset($this->profilefields->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->profilefields->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
+		{
+			$this->profilefields->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_DROPDOWN, $preview);
+		}
+
+		$profile_row['field_value'] = (int) $value;
+		$this->template->assign_block_vars('dropdown', array_change_key_case($profile_row, CASE_UPPER));
+
+		foreach ($this->profilefields->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)
+		{
+			$this->template->assign_block_vars('dropdown.options', array(
+				'OPTION_ID'	=> $option_id,
+				'SELECTED'	=> ($value == $option_id) ? ' selected="selected"' : '',
+				'VALUE'		=> $option_value)
+			);
+		}
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php
index 0bb9d2049b..7285b0f4ba 100644
--- a/phpBB/phpbb/profilefields/type/type_int.php
+++ b/phpBB/phpbb/profilefields/type/type_int.php
@@ -14,9 +14,10 @@ class type_int implements type_interface
 	/**
 	*
 	*/
-	public function __construct(\phpbb\request\request $request, \phpbb\user $user)
+	public function __construct(\phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->request = $request;
+		$this->template = $template;
 		$this->user = $user;
 	}
 
@@ -101,4 +102,38 @@ class type_int implements type_interface
 		}
 		return (int) $field_value;
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function generate_field($profile_row, $preview = false)
+	{
+		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
+		$field_ident = $profile_row['field_ident'];
+		$default_value = $profile_row['lang_default_value'];
+
+		if ($this->request->is_set($field_ident))
+		{
+			$value = ($this->request->variable($field_ident, '') === '') ? null : $this->request->variable($field_ident, $default_value);
+		}
+		else
+		{
+			if (!$preview && array_key_exists($field_ident, $this->user->profile_fields) && is_null($this->user->profile_fields[$field_ident]))
+			{
+				$value = null;
+			}
+			else if (!isset($this->user->profile_fields[$field_ident]) || $preview)
+			{
+				$value = $default_value;
+			}
+			else
+			{
+				$value = $this->user->profile_fields[$field_ident];
+			}
+		}
+
+		$profile_row['field_value'] = (is_null($value) || $value === '') ? '' : (int) $value;
+
+		$this->template->assign_block_vars('int', array_change_key_case($profile_row, CASE_UPPER));
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_interface.php b/phpBB/phpbb/profilefields/type/type_interface.php
index 36dfb5686f..92925c3023 100644
--- a/phpBB/phpbb/profilefields/type/type_interface.php
+++ b/phpBB/phpbb/profilefields/type/type_interface.php
@@ -62,4 +62,13 @@ interface type_interface
 	* @return mixed		Field value to display
 	*/
 	public function get_profile_value($field_value, $field_data);
+
+	/**
+	* Generate the input field for display
+	*
+	* @param array	$profile_row	Array with data for this field
+	* @param bool	$preview		Do we preview the form
+	* @return null
+	*/
+	public function generate_field($profile_row, $preview = false);
 }
diff --git a/phpBB/phpbb/profilefields/type/type_string.php b/phpBB/phpbb/profilefields/type/type_string.php
index e477ff4ea7..c9929b1110 100644
--- a/phpBB/phpbb/profilefields/type/type_string.php
+++ b/phpBB/phpbb/profilefields/type/type_string.php
@@ -14,9 +14,10 @@ class type_string extends type_string_common implements type_interface
 	/**
 	*
 	*/
-	public function __construct(\phpbb\request\request $request, \phpbb\user $user)
+	public function __construct(\phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->request = $request;
+		$this->template = $template;
 		$this->user = $user;
 	}
 
@@ -66,4 +67,18 @@ class type_string extends type_string_common implements type_interface
 	{
 		return $this->validate_string_profile_field('string', $field_value, $field_data);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function generate_field($profile_row, $preview = false)
+	{
+		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
+		$field_ident = $profile_row['field_ident'];
+		$default_value = $profile_row['lang_default_value'];
+		$profile_row['field_value'] = ($this->request->is_set($field_ident)) ? $this->request->variable($field_ident, $default_value, true) : ((!isset($this->user->profile_fields[$field_ident]) || $preview) ? $default_value : $this->user->profile_fields[$field_ident]);
+
+
+		$this->template->assign_block_vars('string', array_change_key_case($profile_row, CASE_UPPER));
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_text.php b/phpBB/phpbb/profilefields/type/type_text.php
index f8377015aa..476e1d204f 100644
--- a/phpBB/phpbb/profilefields/type/type_text.php
+++ b/phpBB/phpbb/profilefields/type/type_text.php
@@ -14,9 +14,10 @@ class type_text extends type_string_common implements type_interface
 	/**
 	*
 	*/
-	public function __construct(\phpbb\request\request $request, \phpbb\user $user)
+	public function __construct(\phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->request = $request;
+		$this->template = $template;
 		$this->user = $user;
 	}
 
@@ -66,4 +67,21 @@ class type_text extends type_string_common implements type_interface
 	{
 		return $this->validate_string_profile_field('text', $field_value, $field_data);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function generate_field($profile_row, $preview = false)
+	{
+		$field_length = explode('|', $profile_row['field_length']);
+		$profile_row['field_rows'] = $field_length[0];
+		$profile_row['field_cols'] = $field_length[1];
+		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
+		$field_ident = $profile_row['field_ident'];
+		$default_value = $profile_row['lang_default_value'];
+
+		$profile_row['field_value'] = ($this->request->is_set($field_ident)) ? $this->request->variable($field_ident, $default_value, true) : ((!isset($this->user->profile_fields[$field_ident]) || $preview) ? $default_value : $this->user->profile_fields[$field_ident]);
+
+		$this->template->assign_block_vars('text', array_change_key_case($profile_row, CASE_UPPER));
+	}
 }