mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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:
Andreas Fischer
2012-07-23 15:50:54 +02:00
parent 147a125f69 7b98e75ec3
commit 9480a5e512
13 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/install/database_update.php
View File

@@ -1071,6 +1071,14 @@ function database_update_info()
'3.0.10-RC3' => array(),
// No changes from 3.0.10 to 3.0.11-RC1
'3.0.10' => array(),
// Changes from 3.0.11-RC1 to 3.0.11-RC2
'3.0.11-RC1' => array(
'add_columns' => array(
PROFILE_FIELDS_TABLE => array(
'field_show_novalue' => array('BOOL', 0),
),
),
),
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */