mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-19 06:51:33 +02:00
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
This commit is contained in:
@@ -992,6 +992,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_pm] [int] DEFAULT (0) NOT NULL ,
|
||||
[field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
|
||||
|
Reference in New Issue
Block a user