2 files changed, 70 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_contact_field.php b/phpBB/phpbb/db/migration/data/v310/profilefield_contact_field.php
new file mode 100644
index 0000000000..c7617813eb
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/profilefield_contact_field.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class profilefield_contact_field extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'profile_fields', 'field_is_contact');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\profilefield_on_memberlist',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_is_contact'			=> array('BOOL', 0),
+					'field_contact_desc'		=> array('VCHAR', ''),
+					'field_contact_url'			=> array('VCHAR', ''),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_is_contact',
+					'field_contact_desc',
+					'field_contact_url',
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index ac2542a6d4..874d0a21e0 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -353,21 +353,40 @@ class manager
 					continue;
 				}
 
+				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
+				if (strpos($field_desc, '%s') !== false)
+				{
+					$field_desc = sprintf($field_desc, $value);
+				}
+				$contact_url = '';
+				if (strpos($ident_ary['data']['field_contact_url'], '%s') !== false)
+				{
+					$contact_url = sprintf($ident_ary['data']['field_contact_url'], $value);
+				}
+
 				$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']),
 
+					'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']),
 
+					'S_PROFILE_CONTACT'						=> $ident_ary['data']['field_is_contact'],
 					'S_PROFILE_' . strtoupper($ident)		=> true,
 				);
 			}