From 15e22af266ab66acbb4c22d0877139f7dda6afd5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 9 Apr 2016 08:09:08 +0200 Subject: [PATCH 1/3] [prep-release-3.1.9] Update version to 3.1.9-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- phpBB/styles/subsilver2/style.cfg | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build.xml b/build/build.xml index 7d9def981a..6e209dfc87 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index a6decaa0e8..be0a9c0d82 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.9-dev'); +define('PHPBB_VERSION', '3.1.9-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index b670678cf3..838ce1a682 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.8', + 'phpbb_version' => '3.1.9', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 179d890a8e..84d0cb3e59 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ 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 ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.9-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.9-RC1'); 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'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index b4bd158a08..ed1790f802 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.1.8 -phpbb_version = 3.1.8 +style_version = 3.1.9 +phpbb_version = 3.1.9 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 96d967b772..d728e27baf 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Limited -style_version = 3.1.8 -phpbb_version = 3.1.8 +style_version = 3.1.9 +phpbb_version = 3.1.9 # Defining a different template bitfield # template_bitfield = lNg= From 5ee6c216e5626b020c83e190e10dd3bcf2c69dfc Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 9 Apr 2016 08:13:31 +0200 Subject: [PATCH 2/3] [prep-release-3.1.9] Add migration for 3.1.9-RC1 --- .../phpbb/db/migration/data/v31x/v319rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v319rc1.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v319rc1.php b/phpBB/phpbb/db/migration/data/v31x/v319rc1.php new file mode 100644 index 0000000000..9805b45572 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v319rc1.php @@ -0,0 +1,36 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v319rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.1.9-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v318', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.9-RC1')), + ); + } +} From e7043dc04452ccebf06e80cb8a7cf38b2ff44ce0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 9 Apr 2016 08:19:34 +0200 Subject: [PATCH 3/3] [prep-release-3.1.9] Add changelog for 3.1.9-RC1 --- phpBB/docs/CHANGELOG.html | 65 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6c0e2d33a5..6b97e80724 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.1.8
    • Changes since 3.1.7-PL1
    • Changes since 3.1.7
    • Changes since 3.1.6
      • @@ -117,7 +118,69 @@
      -

      Changes since 3.1.7-PL1

      +

      Changes since 3.1.8

      + +

      Bug

      +
        +
      • [PHPBB3-8058] - Default style in ACP->Board Settings not observing offset
        • +
      • [PHPBB3-13028] - "View unanswered posts" link should be called instead "View unanswered topics"
        • +
      • [PHPBB3-13264] - Editing an unapproved post as a moderator/admin approves it
        • +
      • [PHPBB3-13521] - Q&A Captcha ACP, required fields error corrupts inputted data
        • +
      • [PHPBB3-13630] - NULL value parsed into $select_single can cause 403 Forbidden on certain restrictive hosting environments for "Find a Member" function within Private Message composition
        • +
      • [PHPBB3-13681] - Email queue shouldn't be cached by opcache
        • +
      • [PHPBB3-13683] - Controller generates urls with absolute path of phpbb's root
        • +
      • [PHPBB3-13842] - Missing rewrite module on IIS7 leads to an error
        • +
      • [PHPBB3-13977] - Fatal error entering UCP if bookmarked topic was deleted
        • +
      • [PHPBB3-14132] - SQL Error when creating a new subject on fresh installation
        • +
      • [PHPBB3-14136] - IE compatibility meta is missing in overall_header.html
        • +
      • [PHPBB3-14241] - Security bug into Spambot control Questions
        • +
      • [PHPBB3-14272] - Use valid html5 input elements in forms
        • +
      • [PHPBB3-14290] - Function set_modified_headers() never sends 304 'Not Modified' header
        • +
      • [PHPBB3-14408] - Remove span corners
        • +
      • [PHPBB3-14422] - Support cmd+enter & ctrl+enter for submitting message
        • +
      • [PHPBB3-14437] - Place Inline Images on Post get scrambled up -- not follow the order you place them in.
        • +
      • [PHPBB3-14443] - jabber notification-template prefix "short" breaks resolution of paths in extensions
        • +
      • [PHPBB3-14475] - Do not log upon automatically removing users form newly registered users group
        • +
      • [PHPBB3-14481] - phpBB does not obey HTTP_X_FORWARDED_PORT header
        • +
      • [PHPBB3-14483] - call to header(arg, arg) function sendHeaders() in Response.php causes Error 500 in app.php generated links
        • +
      • [PHPBB3-14496] - Automatic update relies on cache creating files in cache folder
        • +
      • [PHPBB3-14500] - Duplicate newversion in build.xml
        • +
      • [PHPBB3-14514] - Users get skipped in passwords_convert_p1 migration
        • +
      • [PHPBB3-14519] - Do not query database for unread notifications if all are retrieved
        • +
      • [PHPBB3-14532] - Database column default incorrectly escaped on MSSQL
        • +
      • [PHPBB3-14533] - "U_NOTIFICATION_SETTINGS" doesn't return the correct URL
        • +
      • [PHPBB3-14536] - Force timestamp to be integer in user::format_date()
        • +
      • [PHPBB3-14559] - Attachments' behaviour in quotes
        • +
      • [PHPBB3-14562] - Extension's permissions don't have language fallback
        • +
      • [PHPBB3-14570] - Board versions for 3.2.x can be accidentally downgraded to 3.1.x
        • +
      • [PHPBB3-14577] - Stop using sizeof() inside for() loop
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-10356] - Username search should find all users for administrators instead of NORMALs and FOUNDERs only
        • +
      • [PHPBB3-12305] - Add new event core.viewforum_get_topic_id_sql to control forum topic listing
        • +
      • [PHPBB3-14134] - Send warning notification PM in user's language.
        • +
      • [PHPBB3-14316] - Add memberlist_view.html template events before/after the custom fields and zebra links
        • +
      • [PHPBB3-14365] - Add core event to the function topic_review()
        • +
      • [PHPBB3-14366] - Add core events to the function decode_message()
        • +
      • [PHPBB3-14395] - Add event core.viewtopic_add_quickmod_option_after
        • +
      • [PHPBB3-14471] - Add filedata var to the core.avatar_driver_upload_move_file_before event
        • +
      • [PHPBB3-14486] - Add an event and fix an event in login_box()
        • +
      • [PHPBB3-14508] - Change language notice on account activation
        • +
      • [PHPBB3-14540] - Adjust class recursive_dot_prefix_filter_iterator to increase performance
        • +
      +

      New Feature

      + +

      Task

      + + +

      Changes since 3.1.7-PL1

      Bug