7 files changed, 16 insertions, 16 deletions
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index a2b931ce27..26c11d9e22 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -389,7 +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']);
-			$valueid = $profile_field->get_profile_valueid($ident_ary['value'], $ident_ary['data']);
+			$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
 
 			if ($value === null)
 			{
@@ -415,7 +415,7 @@ class manager
 			$tpl_fields['row'] += array(
 				'PROFILE_' . strtoupper($ident) . '_IDENT'		=> $ident,
 				'PROFILE_' . strtoupper($ident) . '_VALUE'		=> $value,
-				'PROFILE_' . strtoupper($ident) . '_VALUEID'	=> $valueid,
+				'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'],
@@ -427,14 +427,14 @@ class manager
 			);
 
 			$tpl_fields['blockrow'][] = array(
-				'PROFILE_FIELD_IDENT'	=> $ident,
-				'PROFILE_FIELD_VALUE'	=> $value,
-				'PROFILE_FIELD_VALUEID'	=> $valueid,
-				'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 64f4f8293f..c34dd9ce88 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -180,7 +180,7 @@ class type_bool extends type_base
 	/**
 	* {@inheritDoc}
 	*/
-	public function get_profile_valueid($field_value, $field_data)
+	public function get_profile_value_raw($field_value, $field_data)
 	{
 		if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
 		{
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index f59d74c33d..90ac9a6703 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -208,7 +208,7 @@ class type_date extends type_base
 	/**
 	* {@inheritDoc}
 	*/
-	public function get_profile_valueid($field_value, $field_data)
+	public function get_profile_value_raw($field_value, $field_data)
 	{
 		if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
 		{
diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php
index b201c4abbf..f70693e294 100644
--- a/phpBB/phpbb/profilefields/type/type_dropdown.php
+++ b/phpBB/phpbb/profilefields/type/type_dropdown.php
@@ -189,7 +189,7 @@ class type_dropdown extends type_base
 	/**
 	* {@inheritDoc}
 	*/
-	public function get_profile_valueid($field_value, $field_data)
+	public function get_profile_value_raw($field_value, $field_data)
 	{
 		if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
 		{
diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php
index 8a803293d0..dd08df94c1 100644
--- a/phpBB/phpbb/profilefields/type/type_int.php
+++ b/phpBB/phpbb/profilefields/type/type_int.php
@@ -154,7 +154,7 @@ class type_int extends type_base
 	/**
 	* {@inheritDoc}
 	*/
-	public function get_profile_valueid($field_value, $field_data)
+	public function get_profile_value_raw($field_value, $field_data)
 	{
 		if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
 		{
diff --git a/phpBB/phpbb/profilefields/type/type_interface.php b/phpBB/phpbb/profilefields/type/type_interface.php
index 8fe1bb2be5..2dd13fa480 100644
--- a/phpBB/phpbb/profilefields/type/type_interface.php
+++ b/phpBB/phpbb/profilefields/type/type_interface.php
@@ -100,7 +100,7 @@ interface type_interface
 	* @param array	$field_data			Array with requirements of the field
 	* @return mixed		Field value ID to display
 	*/
-	public function get_profile_valueid($field_value, $field_data);
+	public function get_profile_value_raw($field_value, $field_data);
 
 	/**
 	* Get Profile Value for display
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index 1d26ba5d3a..c2b951b6c9 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -112,7 +112,7 @@ abstract class type_string_common extends type_base
 	/**
 	* {@inheritDoc}
 	*/
-	public function get_profile_valueid($field_value, $field_data)
+	public function get_profile_value_raw($field_value, $field_data)
 	{
 		if (!$field_value && !$field_data['field_show_novalue'])
 		{