mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/install/database_update.php
This commit is contained in:
Andreas Fischer
2011-07-10 23:11:29 +02:00
parent e2d27a30a6 e4707a8be7
commit 09e0460e5b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/install/database_update.php
View File

@@ -1050,6 +1050,8 @@ function database_update_info()
'3.0.9-RC2' => array(),
// No changes from 3.0.9-RC3 to 3.0.9-RC4
'3.0.9-RC3' => array(),
// No changes from 3.0.9-RC4 to 3.0.9
'3.0.9-RC4' => array(),
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
@@ -2073,6 +2075,10 @@ function change_database_data(&$no_updates, $version)
case '3.0.9-RC3':
break;
// No changes from 3.0.9-RC4 to 3.0.9
case '3.0.9-RC4':
break;
// Changes from 3.1.0-dev to 3.1.0-A1
case '3.1.0-dev':
set_config('use_system_cron', 0);