diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:49:11 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:49:11 +0100 |
| commit | 0e35a8515598b6cdf38c2b98ecde9e8cc984e594 (patch) | |
| tree | c1250a6fc14fcd1eb7b539a3df8d66790d0bc460 /phpBB/install/schemas/sqlite_schema.sql | |
| parent | 4e144005f0ecca45601f2a90b066144f75c6f165 (diff) | |
| parent | 83a7e632b9b21fed88a3dbea679580d0740664f7 (diff) | |
| download | forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.gz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.bz2 forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.xz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
Diffstat (limited to 'phpBB/install/schemas/sqlite_schema.sql')
| -rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 717b242a57..cbcca318d3 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -644,7 +644,10 @@ CREATE TABLE phpbb_profile_fields ( field_hide INTEGER UNSIGNED NOT NULL DEFAULT '0', field_no_view INTEGER UNSIGNED NOT NULL DEFAULT '0', field_active INTEGER UNSIGNED NOT NULL DEFAULT '0', - field_order INTEGER UNSIGNED NOT NULL DEFAULT '0' + field_order INTEGER UNSIGNED NOT NULL DEFAULT '0', + field_is_contact INTEGER UNSIGNED NOT NULL DEFAULT '0', + field_contact_desc varchar(255) NOT NULL DEFAULT '', + field_contact_url varchar(255) NOT NULL DEFAULT '' ); CREATE INDEX phpbb_profile_fields_fld_type ON phpbb_profile_fields (field_type); @@ -656,6 +659,8 @@ CREATE TABLE phpbb_profile_fields_data ( pf_phpbb_location varchar(255) NOT NULL DEFAULT '', 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) ); @@ -1002,12 +1007,10 @@ CREATE TABLE phpbb_users ( user_sig mediumtext(16777215) NOT NULL DEFAULT '', user_sig_bbcode_uid varchar(8) NOT NULL DEFAULT '', user_sig_bbcode_bitfield varchar(255) NOT NULL DEFAULT '', - user_icq varchar(15) NOT NULL DEFAULT '', user_aim varchar(255) NOT NULL DEFAULT '', user_yim varchar(255) NOT NULL DEFAULT '', user_msnm varchar(255) NOT NULL DEFAULT '', user_jabber varchar(255) NOT NULL DEFAULT '', - user_website varchar(200) NOT NULL DEFAULT '', user_form_salt varchar(32) NOT NULL DEFAULT '', user_new INTEGER UNSIGNED NOT NULL DEFAULT '1', user_reminded tinyint(4) NOT NULL DEFAULT '0', |