diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-20 16:40:50 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-20 16:40:50 +0200 |
| commit | 446607ef534650987bcda4e65023cfc1d290e794 (patch) | |
| tree | 0849566b6929169cf337a723b01182a362677ded | |
| parent | ac81611b90cc07887d67012a19fa7f6422870d51 (diff) | |
| parent | 6da03913bfcd2ac964116a42cdc7d5e7d4b4c6fd (diff) | |
| download | forums-446607ef534650987bcda4e65023cfc1d290e794.tar forums-446607ef534650987bcda4e65023cfc1d290e794.tar.gz forums-446607ef534650987bcda4e65023cfc1d290e794.tar.bz2 forums-446607ef534650987bcda4e65023cfc1d290e794.tar.xz forums-446607ef534650987bcda4e65023cfc1d290e794.zip | |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[prep-release-3.0.11] Bumping version number for 3.0.11 final.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 4a3799d143..28dd36bea8 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.0.11-RC2" /> + <property name="newversion" value="3.0.11" /> <property name="prevversion" value="3.0.10" /> - <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.11-RC1" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.11-RC1, 3.0.11-RC2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 1addb761ca..5a186d0eeb 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1003,6 +1003,8 @@ function database_update_info() ), ), ), + // No changes from 3.0.11-RC2 to 3.0.11 + '3.0.11-RC2' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */ ); @@ -2102,6 +2104,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.11-RC1 to 3.0.11-RC2 case '3.0.11-RC1': break; + + // No changes from 3.0.11-RC2 to 3.0.11 + case '3.0.11-RC2': + break; } } |