diff --git a/build/build.xml b/build/build.xml index 59170ab75f..c3f23b4386 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + @@ -149,7 +149,7 @@ - @@ -177,13 +177,13 @@ save/phpbb-${prevversion}_to_${newversion}_language.patch" /> save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" /> save/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
  • Changelog
      +
    • Changes since 3.1.4
    • Changes since 3.1.3
    • Changes since 3.1.3-RC1
    • Changes since 3.1.2
      • @@ -111,6 +112,88 @@
      +

      Changes since 3.1.4

      + +

      Bug

      +
        +
      • [PHPBB3-9563] - Empty categories showing up on index
        • +
      • [PHPBB3-11521] - Missing language string when migration is invalid
        • +
      • [PHPBB3-11532] - acp_users_overview.html autocompletes "confirm email" and "password" fields in chrome
        • +
      • [PHPBB3-13516] - icc-profiler check should skip extensions vendor
        • +
      • [PHPBB3-13564] - User is not removed from oauth tables upon deletion
        • +
      • [PHPBB3-13664] - Allow changing total list for unapproved posts in mcp_front
        • +
      • [PHPBB3-13755] - uploading attachments results in error: parsing server response.
        • +
      • [PHPBB3-13763] - Language Spelling Error: Completly
        • +
      • [PHPBB3-13771] - AJAX responses do not support exceptions messages
        • +
      • [PHPBB3-13772] - Error in @param variable type for phpbb\passwords\manager
        • +
      • [PHPBB3-13779] - Permission set migration tool grants regular users heightened permissions
        • +
      • [PHPBB3-13787] - Duplicate entry of poll_delete in prosilver template
        • +
      • [PHPBB3-13792] - Travis fails installing hhvm-nigthly
        • +
      • [PHPBB3-13819] - Add missing sql_freeresult() to files in includes/
        • +
      • [PHPBB3-13822] - Permissions are in the wrong category
        • +
      • [PHPBB3-13823] - Update package is missing file with inline whitespace changes
        • +
      • [PHPBB3-13827] - controller\helper::message does not return JSON object for AJAX requests
        • +
      • [PHPBB3-13830] - phpcs doesn't detect class using in catch blocks
        • +
      • [PHPBB3-13833] - Submit a lot of messages without timeout between messages
        • +
      • [PHPBB3-13838] - Add a sniff to ensure that the opening brace of a control statement is on the line after
        • +
      • [PHPBB3-13852] - Inconsistent tab navigation when login in
        • +
      • [PHPBB3-13861] - Old styles are not removed by style update migration
        • +
      • [PHPBB3-13868] - Adding multiple language files for acp/mcp/ucp modules is incorrectly handled for extensions
        • +
      • [PHPBB3-13873] - Remove broken print stylesheet in preference of &view=print
        • +
      • [PHPBB3-13875] - Lint test should ignore cache, ext, and store folder
        • +
      • [PHPBB3-13878] - Properly display background images when printing with webkit browser
        • +
      • [PHPBB3-13888] - "Couldn't fetch mysqli_result" error on username search and egosearch
        • +
      • [PHPBB3-13913] - Post subject of password protected and list-only forums shown on board index
        • +
      • [PHPBB3-13922] - Whitespace found at end of line phpBB/includes/functions_admin.php
        • +
      • [PHPBB3-13928] - Fix build_cfg_template_test after ticket/sec-184
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-12101] - Redirect for Microsoft servers in /includes/functions.php:redirect()
        • +
      • [PHPBB3-12542] - Highlight textarea when files are dragged over it
        • +
      • [PHPBB3-12717] - Improve the code sniffer
        • +
      • [PHPBB3-13200] - Add autocomplete="off" to additional password fields
        • +
      • [PHPBB3-13648] - Allow extensions using custom bbcode validation methods
        • +
      • [PHPBB3-13699] - Add template events in viewforum_body.html before and after the title
        • +
      • [PHPBB3-13745] - Add veiwtopic.php core event to allow manipulating poll data
        • +
      • [PHPBB3-13750] - Add generate_forum_nav() core event to allow modifying navlinks text
        • +
      • [PHPBB3-13752] - Add viewonline.php core event to allow modifying forum data SQL query
        • +
      • [PHPBB3-13753] - Add template events to forum category header
        • +
      • [PHPBB3-13778] - Misleading instruction text for recaptcha plugin
        • +
      • [PHPBB3-13790] - Update phpcs to 2.3.2
        • +
      • [PHPBB3-13791] - Add more post buttons template events to viewtopic_body.html
        • +
      • [PHPBB3-13808] - Add event before and after the search form
        • +
      • [PHPBB3-13809] - Test php parsing on php7 on travis
        • +
      • [PHPBB3-13841] - Add event when topics are moved
        • +
      • [PHPBB3-13858] - Make the Plupload uploader instance available in the global namespace
        • +
      • [PHPBB3-13872] - Allow template events to have a changed tag
        • +
      • [PHPBB3-13876] - Use async webfontloader to load webfont from googles CDN
        • +
      • [PHPBB3-13905] - loading.gif loaded before document load when it isn't needed
        • +
      +

      Security Issue

      +
        +
      • [PHPBB3-13917] - Use hash_equals() if possible in password driver helper
        • +
      • [SECURITY-184] - Do not output passwords to HTML input fields
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-13660] - Allow changing the query for total reports in mcp_front
        • +
      • [PHPBB3-13661] - Allow changing how and which logs are retrieved
        • +
      • [PHPBB3-13668] - Allow modifying the query to get details from the post report
        • +
      • [PHPBB3-13672] - Allow changing the query to obtain the user-submitted report.
        • +
      • [PHPBB3-13685] - Allow modifying the keywords search query for mysql fulltext search
        • +
      • [PHPBB3-13686] - Allow modifying the fulltext native search query for total results before before
        • +
      • [PHPBB3-13689] - Allow modifying the Postgres native search query for results
        • +
      • [PHPBB3-13691] - Allow modifying the fulltext native search query for total results for author
        • +
      • [PHPBB3-13693] - Allow modifying the MySQL author search query for results
        • +
      +

      Task

      +
        +
      • [PHPBB3-13807] - Extend event exporter to filter by min or max version to allow generating event diffs for releases
        • +
      • [PHPBB3-13887] - JS could use some refactoring
        • +
      + +

      Changes since 3.1.3

      Security

      diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index c68f26fc13..e17399e3d9 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -506,9 +506,9 @@ class acp_prune WHERE ug.group_id = ' . (int) $group_id . ' AND ug.user_id <> ' . ANONYMOUS . ' AND u.user_type <> ' . USER_FOUNDER . ' - AND ug.user_pending = 0 ' . - (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : '') . ' - AND u.user_id = ug.user_id'; + AND ug.user_pending = 0 + AND u.user_id = ug.user_id + ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : ''); $result = $db->sql_query($sql); // we're performing an intersection operation, so all the relevant users @@ -532,10 +532,10 @@ class acp_prune $sql = 'SELECT u.user_id, u.username, COUNT(p.post_id) AS queue_posts FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u WHERE u.user_id <> ' . ANONYMOUS . ' - AND u.user_type <> ' . USER_FOUNDER . - (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' + AND u.user_type <> ' . USER_FOUNDER . ' AND ' . $db->sql_in_set('p.post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . ' AND u.user_id = p.poster_id + ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' GROUP BY p.poster_id HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue; $result = $db->sql_query($sql); diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index c53d976615..3e44125204 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.5-dev'); +define('PHPBB_VERSION', '3.1.5-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 990b3136fd..7edbd08e03 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.4', + 'phpbb_version' => '3.1.5', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b740977468..972ee579db 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.5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.5-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/phpbb/db/migration/data/v31x/v315rc1.php b/phpBB/phpbb/db/migration/data/v31x/v315rc1.php new file mode 100644 index 0000000000..4cf4472aa7 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v315rc1.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 v315rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v314', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.5-RC1')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index b39dac079a..0b13b17bea 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.4 -phpbb_version = 3.1.4 +style_version = 3.1.5 +phpbb_version = 3.1.5 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 5fe8de0840..f78e417b84 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.4 -phpbb_version = 3.1.4 +style_version = 3.1.5 +phpbb_version = 3.1.5 # Defining a different template bitfield # template_bitfield = lNg=