mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-16 21:54:00 +02:00
Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
This commit is contained in:
@@ -793,6 +793,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
|
||||
field_required INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_on_reg INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_on_pm INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_on_vt INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_profile INTEGER DEFAULT 0 NOT NULL,
|
||||
field_hide INTEGER DEFAULT 0 NOT NULL,
|
||||
|
@@ -950,6 +950,7 @@ CREATE TABLE [phpbb_profile_fields] (
|
||||
[field_validation] [varchar] (20) DEFAULT ('') NOT NULL ,
|
||||
[field_required] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_on_reg] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_on_pm] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_profile] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_hide] [int] DEFAULT (0) NOT NULL ,
|
||||
|
@@ -557,6 +557,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_validation varbinary(60) DEFAULT '' NOT NULL,
|
||||
field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_pm tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
|
@@ -557,6 +557,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_validation varchar(20) DEFAULT '' NOT NULL,
|
||||
field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_pm tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
|
@@ -1064,6 +1064,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_validation varchar2(60) DEFAULT '' ,
|
||||
field_required number(1) DEFAULT '0' NOT NULL,
|
||||
field_show_on_reg number(1) DEFAULT '0' NOT NULL,
|
||||
field_show_on_pm number(1) DEFAULT '0' NOT NULL,
|
||||
field_show_on_vt number(1) DEFAULT '0' NOT NULL,
|
||||
field_show_profile number(1) DEFAULT '0' NOT NULL,
|
||||
field_hide number(1) DEFAULT '0' NOT NULL,
|
||||
|
@@ -744,6 +744,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_validation varchar(20) DEFAULT '' NOT NULL,
|
||||
field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0),
|
||||
field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0),
|
||||
field_show_on_pm INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_pm >= 0),
|
||||
field_show_on_vt INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_vt >= 0),
|
||||
field_show_profile INT2 DEFAULT '0' NOT NULL CHECK (field_show_profile >= 0),
|
||||
field_hide INT2 DEFAULT '0' NOT NULL CHECK (field_hide >= 0),
|
||||
|
@@ -157,6 +157,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_search_load'
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_anon_lastread', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_birthdays', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_profile', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1');
|
||||
|
@@ -540,6 +540,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_validation varchar(20) NOT NULL DEFAULT '',
|
||||
field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_show_on_reg INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_show_on_pm INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_show_on_vt INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_show_profile INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_hide INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
|
Reference in New Issue
Block a user