diff options
author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 15:50:54 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 15:50:54 +0200 |
commit | 9480a5e5123518091055ddc8eb1bf137d8243eb0 (patch) | |
tree | fef3ed96d016e3123d84ec54a00eaeab6f285b66 /phpBB/install/schemas/firebird_schema.sql | |
parent | 147a125f69683f2f87017bf9870c804a9f09c3d3 (diff) | |
parent | 7b98e75ec3ab06d295834d5b48f85ad4b8744742 (diff) | |
download | forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar.gz forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar.bz2 forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar.xz forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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
Conflicts:
phpBB/includes/acp/acp_profile.php
Diffstat (limited to 'phpBB/install/schemas/firebird_schema.sql')
-rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 155ac2a2d4..588557b92a 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -818,6 +818,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_pm INTEGER DEFAULT 0 NOT NULL, field_show_on_vt INTEGER DEFAULT 0 NOT NULL, |