8 files changed, 153 insertions, 46 deletions
diff --git a/phpBB/phpbb/profilefields/lang_helper.php b/phpBB/phpbb/profilefields/lang_helper.php
index c055931181..2e353722b2 100644
--- a/phpBB/phpbb/profilefields/lang_helper.php
+++ b/phpBB/phpbb/profilefields/lang_helper.php
@@ -49,43 +49,50 @@ class lang_helper
 	}
 
 	/**
-	* Get language entries for options and store them here for later use
+	* Loads preview options into language entries for options
+	*
+	* @param	int		$field_id
+	* @param	int		$lang_id
+	* @param	mixed	$preview_options
 	*/
-	public function get_option_lang($field_id, $lang_id, $field_type, $preview_options)
+	public function load_preview_options($field_id, $lang_id, $preview_options)
 	{
-		if ($preview_options !== false)
-		{
-			$lang_options = (!is_array($preview_options)) ? explode("\n", $preview_options) : $preview_options;
+		$lang_options = (!is_array($preview_options)) ? explode("\n", $preview_options) : $preview_options;
 
-			foreach ($lang_options as $num => $var)
+		foreach ($lang_options as $num => $var)
+		{
+			if (!isset($this->options_lang[$field_id]))
+			{
+				$this->options_lang[$field_id] = array();
+			}
+			if (!isset($this->options_lang[$field_id][$lang_id]))
 			{
-				if (!isset($this->options_lang[$field_id]))
-				{
-					$this->options_lang[$field_id] = array();
-				}
-				if (!isset($this->options_lang[$field_id][$lang_id]))
-				{
-					$this->options_lang[$field_id][$lang_id] = array();
-				}
-				$this->options_lang[$field_id][$lang_id][($num + 1)] = $var;
+				$this->options_lang[$field_id][$lang_id] = array();
 			}
+			$this->options_lang[$field_id][$lang_id][($num + 1)] = $var;
 		}
-		else
-		{
-			$sql = 'SELECT option_id, lang_value
+	}
+
+	/**
+	* Fetches language entries for options from DB
+	*
+	* @param	int		$lang_id
+	*/
+	public function load_option_lang($lang_id)
+	{
+		$sql = 'SELECT field_id, option_id, lang_value
 				FROM ' . $this->language_table . '
-					WHERE field_id = ' . (int) $field_id . '
-					AND lang_id = ' . (int) $lang_id . "
-					AND field_type = '" . $this->db->sql_escape($field_type) . "'
+				WHERE lang_id = ' . (int) $lang_id . "
 				ORDER BY option_id";
-			$result = $this->db->sql_query($sql);
 
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->options_lang[$field_id][$lang_id][($row['option_id'] + 1)] = $row['lang_value'];
-			}
-			$this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->options_lang[$row['field_id']][$lang_id][($row['option_id'] + 1)] = $row['lang_value'];
 		}
+
+		$this->db->sql_freeresult($result);
 	}
 
 	/**
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 490db0419a..26c11d9e22 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -389,6 +389,7 @@ class manager
 		{
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
+			$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
 
 			if ($value === null)
 			{
@@ -412,26 +413,28 @@ class manager
 			}
 
 			$tpl_fields['row'] += array(
-				'PROFILE_' . strtoupper($ident) . '_IDENT'	=> $ident,
-				'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
-				'PROFILE_' . strtoupper($ident) . '_CONTACT'=> $contact_url,
-				'PROFILE_' . strtoupper($ident) . '_DESC'	=> $field_desc,
-				'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
-				'PROFILE_' . strtoupper($ident) . '_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
-				'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
+				'PROFILE_' . strtoupper($ident) . '_IDENT'		=> $ident,
+				'PROFILE_' . strtoupper($ident) . '_VALUE'		=> $value,
+				'PROFILE_' . strtoupper($ident) . '_VALUE_RAW'	=> $value_raw,
+				'PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $contact_url,
+				'PROFILE_' . strtoupper($ident) . '_DESC'		=> $field_desc,
+				'PROFILE_' . strtoupper($ident) . '_TYPE'		=> $ident_ary['data']['field_type'],
+				'PROFILE_' . strtoupper($ident) . '_NAME'		=> $this->user->lang($ident_ary['data']['lang_name']),
+				'PROFILE_' . strtoupper($ident) . '_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
 
 				'S_PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $ident_ary['data']['field_is_contact'],
 				'S_PROFILE_' . strtoupper($ident)			=> true,
 			);
 
 			$tpl_fields['blockrow'][] = array(
-				'PROFILE_FIELD_IDENT'	=> $ident,
-				'PROFILE_FIELD_VALUE'	=> $value,
-				'PROFILE_FIELD_CONTACT'	=> $contact_url,
-				'PROFILE_FIELD_DESC'	=> $field_desc,
-				'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
-				'PROFILE_FIELD_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
-				'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
+				'PROFILE_FIELD_IDENT'		=> $ident,
+				'PROFILE_FIELD_VALUE'		=> $value,
+				'PROFILE_FIELD_VALUE_RAW'	=> $value_raw,
+				'PROFILE_FIELD_CONTACT'		=> $contact_url,
+				'PROFILE_FIELD_DESC'		=> $field_desc,
+				'PROFILE_FIELD_TYPE'		=> $ident_ary['data']['field_type'],
+				'PROFILE_FIELD_NAME'		=> $this->user->lang($ident_ary['data']['lang_name']),
+				'PROFILE_FIELD_EXPLAIN'		=> $this->user->lang($ident_ary['data']['lang_explain']),
 
 				'S_PROFILE_CONTACT'						=> $ident_ary['data']['field_is_contact'],
 				'S_PROFILE_' . strtoupper($ident)		=> true,
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php
index eb8d3e47d6..0582722833 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -155,7 +155,7 @@ class type_bool extends type_base
 
 		if (!$this->lang_helper->is_set($field_id, $lang_id))
 		{
-			$this->lang_helper->get_option_lang($field_id, $lang_id, FIELD_BOOL, false);
+			$this->lang_helper->load_option_lang($lang_id);
 		}
 
 		if (!$field_value && $field_data['field_show_novalue'])
@@ -180,6 +180,24 @@ class type_bool extends type_base
 	/**
 	* {@inheritDoc}
 	*/
+	public function get_profile_value_raw($field_value, $field_data)
+	{
+		if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
+		{
+			return null;
+		}
+
+		if (!$field_value && $field_data['field_show_novalue'])
+		{
+			$field_value = $field_data['field_novalue'];
+		}
+
+		return $field_value;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
 	public function generate_field($profile_row, $preview_options = false)
 	{
 		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
@@ -203,7 +221,14 @@ class type_bool extends type_base
 		{
 			if (!$this->lang_helper->is_set($profile_row['field_id'], $profile_row['lang_id'], 1))
 			{
-				$this->lang_helper->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], $this->get_service_name(), $preview_options);
+				if ($preview_options)
+				{
+					$this->lang_helper->load_preview_options($profile_row['field_id'], $profile_row['lang_id'], $preview_options);
+				}
+				else
+				{
+					$this->lang_helper->load_option_lang($profile_row['lang_id']);
+				}
 			}
 
 			$options = $this->lang_helper->get($profile_row['field_id'], $profile_row['lang_id']);
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index 158eec6a0c..90ac9a6703 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -208,6 +208,19 @@ class type_date extends type_base
 	/**
 	* {@inheritDoc}
 	*/
+	public function get_profile_value_raw($field_value, $field_data)
+	{
+		if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
+		{
+			return null;
+		}
+
+		return $field_value;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
 	public function generate_field($profile_row, $preview_options = false)
 	{
 		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php
index 52c9fcf86a..17ae89e1b2 100644
--- a/phpBB/phpbb/profilefields/type/type_dropdown.php
+++ b/phpBB/phpbb/profilefields/type/type_dropdown.php
@@ -135,7 +135,7 @@ class type_dropdown extends type_base
 		// retrieve option lang data if necessary
 		if (!$this->lang_helper->is_set($field_data['field_id'], $field_data['lang_id'], 1))
 		{
-			$this->lang_helper->get_option_lang($field_data['field_id'], $field_data['lang_id'], $this->get_service_name(), false);
+			$this->lang_helper->load_option_lang($field_data['lang_id']);
 		}
 
 		if (!$this->lang_helper->is_set($field_data['field_id'], $field_data['lang_id'], $field_value))
@@ -160,7 +160,7 @@ class type_dropdown extends type_base
 		$lang_id = $field_data['lang_id'];
 		if (!$this->lang_helper->is_set($field_id, $lang_id))
 		{
-			$this->lang_helper->get_option_lang($field_id, $lang_id, $this->get_service_name(), false);
+			$this->lang_helper->load_option_lang($lang_id);
 		}
 
 		if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
@@ -189,6 +189,24 @@ class type_dropdown extends type_base
 	/**
 	* {@inheritDoc}
 	*/
+	public function get_profile_value_raw($field_value, $field_data)
+	{
+		if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
+		{
+			return null;
+		}
+
+		if (!$field_value && $field_data['field_show_novalue'])
+		{
+			$field_value = $field_data['field_novalue'];
+		}
+
+		return $field_value;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
 	public function generate_field($profile_row, $preview_options = false)
 	{
 		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
@@ -199,7 +217,14 @@ class type_dropdown extends type_base
 
 		if (!$this->lang_helper->is_set($profile_row['field_id'], $profile_row['lang_id'], 1))
 		{
-			$this->lang_helper->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], $this->get_service_name(), $preview_options);
+			if ($preview_options)
+			{
+				$this->lang_helper->load_preview_options($profile_row['field_id'], $profile_row['lang_id'], $preview_options);
+			}
+			else
+			{
+				$this->lang_helper->load_option_lang($profile_row['lang_id']);
+			}
 		}
 
 		$profile_row['field_value'] = (int) $value;
diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php
index 78f1c7d2c9..dd08df94c1 100644
--- a/phpBB/phpbb/profilefields/type/type_int.php
+++ b/phpBB/phpbb/profilefields/type/type_int.php
@@ -154,6 +154,18 @@ class type_int extends type_base
 	/**
 	* {@inheritDoc}
 	*/
+	public function get_profile_value_raw($field_value, $field_data)
+	{
+		if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
+		{
+			return null;
+		}
+		return (int) $field_value;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
 	public function generate_field($profile_row, $preview_options = false)
 	{
 		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
diff --git a/phpBB/phpbb/profilefields/type/type_interface.php b/phpBB/phpbb/profilefields/type/type_interface.php
index 489e916fd5..2dd13fa480 100644
--- a/phpBB/phpbb/profilefields/type/type_interface.php
+++ b/phpBB/phpbb/profilefields/type/type_interface.php
@@ -94,6 +94,15 @@ interface type_interface
 	public function get_profile_value($field_value, $field_data);
 
 	/**
+	* Get Profile Value ID for display (the raw, unprocessed user data)
+	*
+	* @param mixed	$field_value		Field value as stored in the database
+	* @param array	$field_data			Array with requirements of the field
+	* @return mixed		Field value ID to display
+	*/
+	public function get_profile_value_raw($field_value, $field_data);
+
+	/**
 	* Get Profile Value for display
 	*
 	* When displaying a contact field, we don't want to have links already parsed and more
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index b48e3c5add..c2b951b6c9 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -112,6 +112,19 @@ abstract class type_string_common extends type_base
 	/**
 	* {@inheritDoc}
 	*/
+	public function get_profile_value_raw($field_value, $field_data)
+	{
+		if (!$field_value && !$field_data['field_show_novalue'])
+		{
+			return null;
+		}
+
+		return $field_value;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
 	public function get_profile_contact_value($field_value, $field_data)
 	{
 		if (!$field_value && !$field_data['field_show_novalue'])