10 files changed, 64 insertions, 4 deletions
diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php
index c8e405cd0f..e330f76742 100644
--- a/phpBB/includes/db/schema_data.php
+++ b/phpBB/includes/db/schema_data.php
@@ -795,6 +795,7 @@ $schema_data['phpbb_profile_fields_data'] = array(
 		'pf_phpbb_interests'	=> array('TEXT_UNI', ''),
 		'pf_phpbb_occupation'	=> array('TEXT_UNI', ''),
 		'pf_phpbb_icq'			=> array('VCHAR', ''),
+		'pf_phpbb_website'		=> array('VCHAR', ''),
 	),
 	'PRIMARY_KEY'	=> 'user_id',
 );
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 207ea2aa59..d5f7b266d4 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -906,7 +906,6 @@ if (!$get_info)
 				array('user_inactive_reason',	'',									'phpbb_inactive_reason'),
 				array('user_inactive_time',		'',									'phpbb_inactive_time'),
 
-				array('user_website',			'users.user_website',				'validate_website'),
 				array('user_jabber',			'',									''),
 				array('user_msnm',				'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),
 				array('user_yim',				'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
@@ -963,6 +962,7 @@ if (!$get_info)
 				array('pf_phpbb_interests',		'users.user_interests',				array('function1' => 'phpbb_set_encoding')),
 				array('pf_phpbb_location',		'users.user_from',					array('function1' => 'phpbb_set_encoding')),
 				array('pf_phpbb_icq',			'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_website',		'users.user_website',				'validate_website'),
 
 				'where'			=> 'users.user_id <> -1',
 			),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index d0cab35dc8..62ba2fa6e6 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -954,7 +954,8 @@ CREATE TABLE phpbb_profile_fields_data (
 	pf_phpbb_location VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	pf_phpbb_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	pf_phpbb_occupation BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
-	pf_phpbb_icq VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
+	pf_phpbb_icq VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	pf_phpbb_website VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_profile_fields_data ADD PRIMARY KEY (user_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index b017362315..7eb5a549de 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1135,7 +1135,7 @@ CREATE TABLE [phpbb_profile_fields] (
 	[field_order] [int] DEFAULT (0) NOT NULL ,
 	[field_is_contact] [int] DEFAULT (0) NOT NULL ,
 	[field_contact_desc] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[field_contact_url] [varchar] (255) DEFAULT ('') NOT NULL
+	[field_contact_url] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
@@ -1161,7 +1161,8 @@ CREATE TABLE [phpbb_profile_fields_data] (
 	[pf_phpbb_location] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[pf_phpbb_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[pf_phpbb_occupation] [varchar] (4000) DEFAULT ('') NOT NULL ,
-	[pf_phpbb_icq] [varchar] (255) DEFAULT ('') NOT NULL 
+	[pf_phpbb_icq] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[pf_phpbb_website] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 9d0ee88b1a..31b8184f75 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -680,6 +680,7 @@ CREATE TABLE phpbb_profile_fields_data (
 	pf_phpbb_interests blob NOT NULL,
 	pf_phpbb_occupation blob NOT NULL,
 	pf_phpbb_icq varbinary(255) DEFAULT '' NOT NULL,
+	pf_phpbb_website varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (user_id)
 );
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index ad7609d651..ba9293ae4a 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -680,6 +680,7 @@ CREATE TABLE phpbb_profile_fields_data (
 	pf_phpbb_interests text NOT NULL,
 	pf_phpbb_occupation text NOT NULL,
 	pf_phpbb_icq varchar(255) DEFAULT '' NOT NULL,
+	pf_phpbb_website varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (user_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 9797c6d784..e023f2c735 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1273,6 +1273,7 @@ CREATE TABLE phpbb_profile_fields_data (
 	pf_phpbb_interests clob DEFAULT '' ,
 	pf_phpbb_occupation clob DEFAULT '' ,
 	pf_phpbb_icq varchar2(255) DEFAULT '' ,
+	pf_phpbb_website varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_profile_fields_data PRIMARY KEY (user_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 88323a5695..814403ed3e 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -890,6 +890,7 @@ CREATE TABLE phpbb_profile_fields_data (
 	pf_phpbb_interests varchar(4000) DEFAULT '' NOT NULL,
 	pf_phpbb_occupation varchar(4000) DEFAULT '' NOT NULL,
 	pf_phpbb_icq varchar(255) DEFAULT '' NOT NULL,
+	pf_phpbb_website varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (user_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index c0241be6cf..d6d2c5c348 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -660,6 +660,7 @@ CREATE TABLE phpbb_profile_fields_data (
 	pf_phpbb_interests text(65535) NOT NULL DEFAULT '',
 	pf_phpbb_occupation text(65535) NOT NULL DEFAULT '',
 	pf_phpbb_icq varchar(255) NOT NULL DEFAULT '',
+	pf_phpbb_website varchar(255) NOT NULL DEFAULT '',
 	PRIMARY KEY (user_id)
 );
 
diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_website.php b/phpBB/phpbb/db/migration/data/v310/profilefield_website.php
new file mode 100644
index 0000000000..818b66d2e4
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/profilefield_website.php
@@ -0,0 +1,52 @@
+<?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_website extends \phpbb\db\migration\profilefield_base_migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\profilefield_on_memberlist',
+			'\phpbb\db\migration\data\v310\profilefield_icq_cleanup',
+		);
+	}
+
+	protected $profilefield_name = 'phpbb_website';
+
+	protected $profilefield_database_type = array('VCHAR', '');
+
+	protected $profilefield_data = array(
+		'field_name'			=> 'phpbb_website',
+		'field_type'			=> 'profilefields.type.url',
+		'field_ident'			=> 'phpbb_website',
+		'field_length'			=> '40',
+		'field_minlen'			=> '12',
+		'field_maxlen'			=> '255',
+		'field_novalue'			=> '',
+		'field_default_value'	=> '',
+		'field_validation'		=> '',
+		'field_required'		=> 0,
+		'field_show_novalue'	=> 0,
+		'field_show_on_reg'		=> 0,
+		'field_show_on_pm'		=> 1,
+		'field_show_on_vt'		=> 1,
+		'field_show_on_ml'		=> 1,
+		'field_show_profile'	=> 1,
+		'field_hide'			=> 0,
+		'field_no_view'			=> 0,
+		'field_active'			=> 1,
+		'field_is_contact'		=> 1,
+		'field_contact_desc'	=> 'VISIT_WEBSITE',
+		'field_contact_url'		=> '%s',
+	);
+
+	protected $user_column_name = 'user_website';
+}