mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-25 09:30:46 +02:00
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value
This commit is contained in:
@@ -807,6 +807,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_default_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
|
||||
field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
|
||||
field_required INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_novalue INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_on_reg INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_on_vt INTEGER DEFAULT 0 NOT NULL,
|
||||
field_show_profile INTEGER DEFAULT 0 NOT NULL,
|
||||
|
@@ -974,6 +974,7 @@ CREATE TABLE [phpbb_profile_fields] (
|
||||
[field_default_value] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[field_validation] [varchar] (20) DEFAULT ('') NOT NULL ,
|
||||
[field_required] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_novalue] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_on_reg] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_profile] [int] DEFAULT (0) NOT NULL ,
|
||||
|
@@ -571,6 +571,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_default_value blob NOT NULL,
|
||||
field_validation varbinary(60) DEFAULT '' NOT NULL,
|
||||
field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_novalue tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_reg 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,
|
||||
|
@@ -571,6 +571,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_default_value varchar(255) DEFAULT '' NOT NULL,
|
||||
field_validation varchar(20) DEFAULT '' NOT NULL,
|
||||
field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_novalue tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
field_show_on_reg 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,
|
||||
|
@@ -1085,6 +1085,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_default_value varchar2(765) DEFAULT '' ,
|
||||
field_validation varchar2(60) DEFAULT '' ,
|
||||
field_required number(1) DEFAULT '0' NOT NULL,
|
||||
field_show_novalue number(1) DEFAULT '0' NOT NULL,
|
||||
field_show_on_reg 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,
|
||||
|
@@ -761,6 +761,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_default_value varchar(255) DEFAULT '' NOT NULL,
|
||||
field_validation varchar(20) DEFAULT '' NOT NULL,
|
||||
field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0),
|
||||
field_show_novalue INT2 DEFAULT '0' NOT NULL CHECK (field_show_novalue >= 0),
|
||||
field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 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),
|
||||
|
@@ -554,6 +554,7 @@ CREATE TABLE phpbb_profile_fields (
|
||||
field_default_value varchar(255) NOT NULL DEFAULT '',
|
||||
field_validation varchar(20) NOT NULL DEFAULT '',
|
||||
field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_show_novalue INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
field_show_on_reg 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',
|
||||
|
Reference in New Issue
Block a user