diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-01 16:03:06 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-01 16:03:06 +0100 |
| commit | 3f91405acb5e5fcc026aa6e9fe1046d8f95144cc (patch) | |
| tree | 79744ff21ce4715c8cb33096dd1ec62c359e185e | |
| parent | 5cc1eb27c7dfb5f6124a128dda37f65c1e826668 (diff) | |
| parent | e14c3f3b77ab07ce97f357a15db5db5101df06c1 (diff) | |
| download | forums-3f91405acb5e5fcc026aa6e9fe1046d8f95144cc.tar forums-3f91405acb5e5fcc026aa6e9fe1046d8f95144cc.tar.gz forums-3f91405acb5e5fcc026aa6e9fe1046d8f95144cc.tar.bz2 forums-3f91405acb5e5fcc026aa6e9fe1046d8f95144cc.tar.xz forums-3f91405acb5e5fcc026aa6e9fe1046d8f95144cc.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[prep-release-3.0.10] Bumping version number for 3.0.10 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 bf4c97297b..3d8d3de640 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.10-RC3" /> + <property name="newversion" value="3.0.10" /> <property name="prevversion" value="3.0.9" /> - <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.10-RC1, 3.0.10-RC2" /> + <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.10-RC1, 3.0.10-RC2, 3.0.10-RC3" /> <!-- 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 9c44350955..a1b7dcd47f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -991,6 +991,8 @@ function database_update_info() '3.0.10-RC1' => array(), // No changes from 3.0.10-RC2 to 3.0.10-RC3 '3.0.10-RC2' => array(), + // No changes from 3.0.10-RC3 to 3.0.10 + '3.0.10-RC3' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ ); @@ -2018,6 +2020,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.10-RC2 to 3.0.10-RC3 case '3.0.10-RC2': break; + + // No changes from 3.0.10-RC3 to 3.0.10 + case '3.0.10-RC3': + break; } } |