diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-26 22:20:32 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-26 22:20:32 +0100 |
| commit | 7520b2763973b7ca892bd8339acb98c894b57a1c (patch) | |
| tree | e0f05dd1e52fd8c7641c76379b142d26dca88f26 | |
| parent | f856cc2ef69c40609c1ebe5494a22fdda5c6bb05 (diff) | |
| parent | 007457f18295cd4019684e1470110dd4b50de8cf (diff) | |
| download | forums-7520b2763973b7ca892bd8339acb98c894b57a1c.tar forums-7520b2763973b7ca892bd8339acb98c894b57a1c.tar.gz forums-7520b2763973b7ca892bd8339acb98c894b57a1c.tar.bz2 forums-7520b2763973b7ca892bd8339acb98c894b57a1c.tar.xz forums-7520b2763973b7ca892bd8339acb98c894b57a1c.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-RC2.
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 | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index c942142b5e..18b03243c2 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-RC1" /> + <property name="newversion" value="3.0.10-RC2" /> <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" /> + <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" /> <!-- 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 29d9c86fa9..8289e56ee8 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -987,6 +987,9 @@ function database_update_info() '3.0.9-RC4' => array(), // No changes from 3.0.9 to 3.0.10-RC1 '3.0.9' => array(), + // No changes from 3.0.10-RC1 to 3.0.10-RC2 + '3.0.10-RC1' => array(), + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ ); @@ -2006,6 +2009,10 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + + // No changes from 3.0.10-RC1 to 3.0.10-RC2 + case '3.0.10-RC1': + break; } } |