From 313a224c688fa1e2575b22092384458ae23d5147 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 9 Apr 2015 20:26:12 +0200 Subject: [PATCH 1/4] Update version to 3.1.4-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 b0a9190898..7628e69f2d 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 321a87b4b0..2fa489ff2d 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.4-dev'); +define('PHPBB_VERSION', '3.1.4-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 511f850679..990b3136fd 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.3', + 'phpbb_version' => '3.1.4', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index a39bb365d6..b6f11f7353 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.4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.4-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 34a7618f86..b39dac079a 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.3 -phpbb_version = 3.1.3 +style_version = 3.1.4 +phpbb_version = 3.1.4 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 8f3f55ec87..5fe8de0840 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.3 -phpbb_version = 3.1.3 +style_version = 3.1.4 +phpbb_version = 3.1.4 # Defining a different template bitfield # template_bitfield = lNg= From bc04581b8010affb4192f5b160e1e5e2ff21d325 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 9 Apr 2015 20:28:28 +0200 Subject: [PATCH 2/4] [prep-release-3.1.4] Add migration for 3.1.4-RC1 --- .../phpbb/db/migration/data/v31x/v314rc1.php | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v314rc1.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v314rc1.php b/phpBB/phpbb/db/migration/data/v31x/v314rc1.php new file mode 100644 index 0000000000..10cdbe3f9c --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v314rc1.php @@ -0,0 +1,31 @@ + +* @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 v314rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v313', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.4-RC1')), + ); + } +} From 073f3e4470016af718f90070276305615abc007f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 9 Apr 2015 21:11:08 +0200 Subject: [PATCH 3/4] [prep-release-3.1.4] Add changelog for 3.1.4-RC1 --- phpBB/docs/CHANGELOG.html | 117 +++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9710014b56..27275d4cfc 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,7 +49,8 @@
  1. Changelog
      -
    • Changes since 3.1.3-RC1
      • +
    • Changes since 3.1.3
      • +
    • Changes since 3.1.3-RC1
    • Changes since 3.1.2
    • Changes since 3.1.1
    • Changes since 3.1.0
      • @@ -109,6 +110,120 @@
      +

      Changes since 3.1.3

      + +

      Bug

      +
        +
      • [PHPBB3-8050] - Avatar & Long PM recipients list break out of template
        • +
      • [PHPBB3-8250] - Forum selections in MCP queue not working
        • +
      • [PHPBB3-8494] - Cannot install two boards on the same postgresql database
        • +
      • [PHPBB3-11424] - Quick-Mod Tools race condition results in NO_MODE
        • +
      • [PHPBB3-12368] - Updating database fails in upgrade from 3.0 when trying twice without purging the cache
        • +
      • [PHPBB3-13348] - sql_freeresult() should be called in feed base class
        • +
      • [PHPBB3-13414] - download/file.php 304 Not Modified bug
        • +
      • [PHPBB3-13433] - A dot in email address leads to unwanted extraneous dot
        • +
      • [PHPBB3-13463] - Mark read icon displays on wrong side in RTL
        • +
      • [PHPBB3-13469] - Soft delete fails with error message
        • +
      • [PHPBB3-13472] - Notification for admin activation of user doesn't get pruned after the user is deleted
        • +
      • [PHPBB3-13477] - File caching of extensions' version check file doesn't work
        • +
      • [PHPBB3-13493] - $helper->route gives wrong path for guests with trailing slashes and mod_rewrite disabled
        • +
      • [PHPBB3-13522] - Q&A Captcha ACP, admins can add blank answers
        • +
      • [PHPBB3-13538] - Add tests for pagination in nested loops
        • +
      • [PHPBB3-13542] - Add $error to core UCP event for better validating of new UCP options
        • +
      • [PHPBB3-13550] - Invalid JSON response returned when plupload dir is not writable
        • +
      • [PHPBB3-13551] - Authentication method- LDAP- entered value 'ldap base dn' does not display
        • +
      • [PHPBB3-13555] - Poll options preview rendered incorrectly by <br /> collision
        • +
      • [PHPBB3-13563] - No Private Message button shown in memberlist for subsilver2
        • +
      • [PHPBB3-13568] - Imagick path validated as relative path although ACP asks for absolute path
        • +
      • [PHPBB3-13569] - Use sql_freeresult for $result assignments and remove unneeded $result assignments
        • +
      • [PHPBB3-13570] - Mysqli extension supports persistent connection since PHP 5.3.0
        • +
      • [PHPBB3-13577] - Skip tests requiring fileinfo if fileinfo is not enabled
        • +
      • [PHPBB3-13586] - Allow '0' as username with Jabber notifications
        • +
      • [PHPBB3-13587] - SQL syntax errors in get_prune_users()
        • +
      • [PHPBB3-13588] - Information message for disabled fsockopen() is not displayed correctly
        • +
      • [PHPBB3-13590] - Remember me login keys should be centered
        • +
      • [PHPBB3-13597] - Modify variable-variable syntax to be compatible with PHP7
        • +
      • [PHPBB3-13612] - Functional test of extension fails if ext requires page refresh
        • +
      • [PHPBB3-13615] - Avatar Gallery shows categories but no images in subsilver2
        • +
      • [PHPBB3-13617] - Bot session continuation with invalid f= query paramter causes SQL error
        • +
      • [PHPBB3-13618] - Small grammatical typo in the English FAQ regarding COPPA
        • +
      • [PHPBB3-13631] - Fix variable name in core.phpbb_content_visibility_get_global_visibility_before event
        • +
      • [PHPBB3-13639] - Unused class icon-search-advanced references nonexistent image
        • +
      • [PHPBB3-13644] - Type hint dispatcher_interface instead of dispatcher
        • +
      • [PHPBB3-13649] - Subforum tooltip always displays "no unread posts" on viewforum.php
        • +
      • [PHPBB3-13655] - $phpbb_dispatcher undefined in phpbb_mcp_sorting()
        • +
      • [PHPBB3-13657] - Start testing against PHP7
        • +
      • [PHPBB3-13666] - data-clicked attribute is not always removed on ajax form submissions
        • +
      • [PHPBB3-13667] - Big buttons are incorrectly aligned in Chrome on Windows
        • +
      • [PHPBB3-13670] - Fix fatal function name must be a string in functional tests
        • +
      • [PHPBB3-13698] - Incorrect password message shows unparsed "Board Administrator"-link
        • +
      • [PHPBB3-13702] - Page is zoomed in by default on iOS devices in landscape mode
        • +
      • [PHPBB3-13703] - Uploaded avatars are not loading correctly when passing through the events
        • +
      • [PHPBB3-13719] - Remove superfluous $search_options in acp_search.php
        • +
      • [PHPBB3-13721] - URL Rewriting doesn't work on IIS7
        • +
      • [PHPBB3-13723] - Update docs/AUTHORS for 3.1.4-RC1
        • +
      • [PHPBB3-13726] - Responsive breadcrumbs JavaScript incorrectly calculates width of hidden items
        • +
      • [PHPBB3-13727] - Responsive breadcrumbs JavaScript doesn't reset wrap- classes when resizing
        • +
      • [PHPBB3-13732] - Update composer for PHP7 compatibility
        • +
      • [PHPBB3-13736] - Replace colons with colon lang keys in Contact us page
        • +
      • [PHPBB3-13738] - Sami still refers to develop-* branches
        • +
      • [PHPBB3-13741] - Remove outdated comments in CSS files
        • +
      • [PHPBB3-13742] - Local avatar driver is not generating correct urls on index
        • +
      • [PHPBB3-13743] - Missing global vars $phpbb_root_path and $phpEx in message_parser.php
        • +
      • [PHPBB3-13747] - Fix test_validate_path_linux method
        • +
      • [PHPBB3-13749] - Add missing slash to base uri in helper route tests
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13313] - Add a core php event to the mass email form
        • +
      • [PHPBB3-13467] - Add a CONTRIBUTING file to the project on Github
        • +
      • [PHPBB3-13510] - Add template event before/after the pagination on viewtopic
        • +
      • [PHPBB3-13512] - Add template events to viewtopic_body.html before/after the post details
        • +
      • [PHPBB3-13518] - Add core event to markread() in functions.php
        • +
      • [PHPBB3-13532] - Add core event to get_unread_topics() in functions.php
        • +
      • [PHPBB3-13533] - Add template events to the header of search_results.html
        • +
      • [PHPBB3-13535] - Add ucp_profile.php core event to allow modifying account settings on editing
        • +
      • [PHPBB3-13536] - Add UCP/ACP core events to allow modifying user profile data on editing
        • +
      • [PHPBB3-13537] - Add core events on mcp_queue for approval and disapproval
        • +
      • [PHPBB3-13540] - Add events to the topic review while posting and moderating posts
        • +
      • [PHPBB3-13578] - Add ucp_register.php core event
        • +
      • [PHPBB3-13591] - Add functions.php core event to the function obtain_users_online_string()
        • +
      • [PHPBB3-13595] - Remove unused instances of the bbcode class
        • +
      • [PHPBB3-13596] - Add display_forums() core event to allow modifying forums list data
        • +
      • [PHPBB3-13600] - Add core event to allow extensions to create a custom help page
        • +
      • [PHPBB3-13602] - Add template event overall_header_navbar_before
        • +
      • [PHPBB3-13628] - Add template events into ucp profile html files
        • +
      • [PHPBB3-13635] - Add sql_ary to UCP profile event
        • +
      • [PHPBB3-13637] - Add php event for modifying the data when composing a PM
        • +
      • [PHPBB3-13643] - kernel_terminate_subscriber should have a very low priority
        • +
      • [PHPBB3-13650] - New core event for UCP profile mode
        • +
      • [PHPBB3-13658] - [Event] - Before and after deletion of topics
        • +
      • [PHPBB3-13675] - Add validate to acp_profile event and add template events
        • +
      • [PHPBB3-13679] - Add template event overall_header_searchbox_before
        • +
      • [PHPBB3-13701] - New posting_pm_layout.html template events to wrap "include posting_pm_header.html"
        • +
      • [PHPBB3-13710] - Add template events around smilies display
        • +
      +

      New Feature

      + +

      Sub-task

      +
        +
      • [PHPBB3-13142] - [Event] - Before query to list unapproved and deleted posts
        • +
      • [PHPBB3-13592] - Add core event to allow changing get_visibility_sql's result
        • +
      • [PHPBB3-13621] - Fix event phpbb_content_visibility_get_forums_visibility_before to get where_sql working as specified
        • +
      • [PHPBB3-13625] - Add more variables to core.viewforum_get_topic_data
        • +
      +

      Task

      + +

      Changes since 3.1.3-RC1

      Bug

      From a151ad912a21e9f7ba4d5ef3bbee32b725cd1c5d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 10 Apr 2015 09:56:20 +0200 Subject: [PATCH 4/4] [3.1.x] Update development version to 3.1.5-dev --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index 7628e69f2d..d4b1bdffaa 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 2fa489ff2d..c53d976615 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.4-RC1'); +define('PHPBB_VERSION', '3.1.5-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b6f11f7353..b740977468 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.4-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.5-dev'); 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');