mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-12 20:02:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.0.12' into develop-olympus

Browse Source 
* 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
This commit is contained in:
Andreas Fischer 2013-09-27 01:32:09 +02:00
commit 9a5415fe6d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.xml
View File

@ -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}" />

6
phpBB/install/database_update.php
View File

@ -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;
}
}