diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:25:54 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:25:54 +0100 |
| commit | 3176dcbc05383ab7cb72e228ab7b2ea1929643ab (patch) | |
| tree | a67c4797443662f9bc52468d30394c1b9c9ce536 | |
| parent | 7d47670c23ecc38decda0a70d78e4d992239fdaf (diff) | |
| parent | 138f123bd81bdd25bde28ca46a9ebf1673ffaecd (diff) | |
| download | forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar.gz forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar.bz2 forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar.xz forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
Conflicts:
phpBB/install/database_update.php
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 2c42e1e162..bf4c97297b 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-RC2" /> + <property name="newversion" value="3.0.10-RC3" /> <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" /> + <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" /> <!-- 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 fa0fba9dc7..2b5ce4bf31 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1060,7 +1060,8 @@ function database_update_info() '3.0.9' => array(), // No changes from 3.0.10-RC1 to 3.0.10-RC2 '3.0.10-RC1' => array(), - + // No changes from 3.0.10-RC2 to 3.0.10-RC3 + '3.0.10-RC2' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ @@ -2132,6 +2133,10 @@ function change_database_data(&$no_updates, $version) case '3.0.10-RC1': break; + // No changes from 3.0.10-RC2 to 3.0.10-RC3 + case '3.0.10-RC2': + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': @@ -2353,6 +2358,7 @@ function change_database_data(&$no_updates, $version) } $no_updates = false; + break; } } |