aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-23 23:30:20 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-23 23:41:47 +0200
commit9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c (patch)
tree8e41d39e85a8a023d4eeace624e1e52698f9d7f0
parent9279c8f5ee3d82116cbe61ad542bff1554ffd454 (diff)
downloadforums-9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c.tar
forums-9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c.tar.gz
forums-9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c.tar.bz2
forums-9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c.tar.xz
forums-9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c.zip
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
-rw-r--r--build/build.xml4
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/database_update.php6
-rw-r--r--phpBB/install/schemas/schema_data.sql2
4 files changed, 9 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml
index c1179015eb..a624050750 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.11-RC1" />
+ <property name="newversion" value="3.0.11-RC2" />
<property name="prevversion" value="3.0.10" />
- <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" />
+ <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.11-RC1" />
<!-- 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 5b72d89795..f8296a8e84 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.11-RC1');
+define('PHPBB_VERSION', '3.0.11-RC2');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c51286f25f..95b3401a7e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
*
*/
-define('UPDATES_TO_VERSION', '3.0.11-RC1');
+define('UPDATES_TO_VERSION', '3.0.11-RC2');
// Enter any version to update from to test updates. The version within the db will not be updated.
define('DEBUG_FROM_VERSION', false);
@@ -2098,6 +2098,10 @@ function change_database_data(&$no_updates, $version)
$no_updates = false;
break;
+
+ // No changes from 3.0.11-RC1 to 3.0.11-RC2
+ case '3.0.11-RC1':
+ break;
}
}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 99b8f7f96d..cdfb4edc66 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.11-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC2');
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');