aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2015-01-26 18:08:31 +0100
committerNils Adermann <naderman@naderman.de>2015-01-26 18:08:31 +0100
commit5ce89ae82f7be38ef539872dc1fd360fb45c906a (patch)
tree1eb80c3271fd0a67c0a63d80a368a88090f89af5
parent4b42589cfac7c5431d0ce1664a7337b3bf798e68 (diff)
downloadforums-5ce89ae82f7be38ef539872dc1fd360fb45c906a.tar
forums-5ce89ae82f7be38ef539872dc1fd360fb45c906a.tar.gz
forums-5ce89ae82f7be38ef539872dc1fd360fb45c906a.tar.bz2
forums-5ce89ae82f7be38ef539872dc1fd360fb45c906a.tar.xz
forums-5ce89ae82f7be38ef539872dc1fd360fb45c906a.zip
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
-rw-r--r--build/build.xml6
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/database_update.php8
-rw-r--r--phpBB/install/schemas/schema_data.sql2
4 files changed, 12 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml
index e3ca10675c..5ae18416c4 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.13-RC1" />
- <property name="prevversion" value="3.0.12" />
- <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.11" />
+ <property name="newversion" value="3.0.13" />
+ <property name="prevversion" value="3.0.13-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.9, 3.0.10, 3.0.11, 3.0.12" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 4b1a8f154b..a0a849aa21 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.0.13-RC1');
+define('PHPBB_VERSION', '3.0.13');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 15f9c589d3..51fe0a8cab 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
*
*/
-define('UPDATES_TO_VERSION', '3.0.13-RC1');
+define('UPDATES_TO_VERSION', '3.0.13');
// Enter any version to update from to test updates. The version within the db will not be updated.
define('DEBUG_FROM_VERSION', false);
@@ -1013,6 +1013,8 @@ function database_update_info()
'3.0.12-RC3' => array(),
// No changes from 3.0.12 to 3.0.13-RC1
'3.0.12' => array(),
+ // No changes from 3.0.13-RC1 to 3.0.13
+ '3.0.13-RC1' => array(),
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.14-RC1 */
);
@@ -2260,6 +2262,10 @@ function change_database_data(&$no_updates, $version)
// No changes from 3.0.12 to 3.0.13-RC1
case '3.0.12':
break;
+
+ // No changes from 3.0.13-RC1 to 3.0.13
+ case '3.0.13-RC1':
+ break;
}
}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index bdfc34dffd..a574bc29c6 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');