diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-27 01:32:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-27 01:32:09 +0200 |
| commit | 9a5415fe6d189f5eb5571068061c8964c03fdca0 (patch) | |
| tree | 32cf80de1df83ac9323c133860f63b1eb272e006 | |
| parent | 259a6f0834e17134719e09475593eae4ce40a017 (diff) | |
| parent | d18bded3acf8e307a5329fe3777b616bbc1d9119 (diff) | |
| download | forums-9a5415fe6d189f5eb5571068061c8964c03fdca0.tar forums-9a5415fe6d189f5eb5571068061c8964c03fdca0.tar.gz forums-9a5415fe6d189f5eb5571068061c8964c03fdca0.tar.bz2 forums-9a5415fe6d189f5eb5571068061c8964c03fdca0.tar.xz forums-9a5415fe6d189f5eb5571068061c8964c03fdca0.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[prep-release-3.0.12] Bumping version number for 3.0.12 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 d034c79731..e2f69a139c 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.12-RC3" /> + <property name="newversion" value="3.0.12" /> <property name="prevversion" value="3.0.11" /> - <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.10, 3.0.12-RC1, 3.0.12-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.9, 3.0.10, 3.0.12-RC1, 3.0.12-RC2, 3.0.12-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 1070b10b18..7c57dfdc1f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1009,6 +1009,8 @@ function database_update_info() '3.0.12-RC1' => array(), // No changes from 3.0.12-RC2 to 3.0.12-RC3 '3.0.12-RC2' => array(), + // No changes from 3.0.12-RC3 to 3.0.12 + '3.0.12-RC3' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.13-RC1 */ ); @@ -2248,6 +2250,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.12-RC2 to 3.0.12-RC3 case '3.0.12-RC2': break; + + // No changes from 3.0.12-RC3 to 3.0.12 + case '3.0.12-RC3': + break; } } |