From 9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 23 Jul 2012 23:30:20 +0200 Subject: [PATCH 1/2] [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 6 +++++- phpBB/install/schemas/schema_data.sql | 2 +- 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 @@ - + - + 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'); From ece4a2edb7f098bb4f0db7d1e2b6d8d405260b13 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 23 Jul 2012 23:36:15 +0200 Subject: [PATCH 2/2] [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. --- phpBB/docs/CHANGELOG.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 71e28be9bc..4d44a88634 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -158,6 +158,14 @@
  • [PHPBB3-10890] - test_sql_fetchrow_returns_false_when_empty() fails on MSSQL and Oracle
  • [PHPBB3-10908] - No remote avatar size limit results in files limited only by PHP memory limit
  • [PHPBB3-10913] - Admin is logged out when accessing any url under adm/ without session id
    • +
  • [PHPBB3-10441] - Update to docs/README.html
    • +
  • [PHPBB3-10773] - ACP phpBB logo needs registered trademark symbol
    • +
  • [PHPBB3-10935] - Limit number of PM rules per user
    • +
  • [PHPBB3-10937] - Comment removal functions: Backward compatibility broken
    • +
  • [PHPBB3-10950] - Deleting user with undelivered PMs causes SQL error
    • +
  • [PHPBB3-10952] - includes/constants.php version number incorrect
    • +
  • [PHPBB3-10965] - Dropdown CPF now shows in profile when no value is selected
    • +
  • [PHPBB3-10978] - Typo in prosilvers ucp_groups_membership.html

    • Improvement

      @@ -188,6 +196,7 @@
    • [PHPBB3-10891] - Allow specifying test config file name via environment variable
    • [PHPBB3-10892] - Cosmetic improvements to RUNNING_TESTS.txt
    • [PHPBB3-10898] - Do not write ?> into config.php to avoid whitespace output
      • +
    • [PHPBB3-10925] - Clarify that SQLite3 is not supported for phpBB 3.0.x

    New Feature