From 3e8a62f30962228b7d44fdad102f51641d8c7aca Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 13 Feb 2016 14:52:57 +0100 Subject: [PATCH 1/6] [prep-release-3.1.8] Update version to 3.1.8-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 b9002f5744..6479d0725f 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 a1d85cf272..1e30dd5b3d 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.8-dev'); +define('PHPBB_VERSION', '3.1.8-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 56bc23c32d..b670678cf3 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.7', + 'phpbb_version' => '3.1.8', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4f87954907..cb0b2ce352 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.8-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.8-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 f1a34bcf68..b4bd158a08 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.7 -phpbb_version = 3.1.7 +style_version = 3.1.8 +phpbb_version = 3.1.8 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 77cea1a55f..96d967b772 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.7 -phpbb_version = 3.1.7 +style_version = 3.1.8 +phpbb_version = 3.1.8 # Defining a different template bitfield # template_bitfield = lNg= From a1a84c993094c6a78c252647a510e5082aa83a09 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 13 Feb 2016 14:55:24 +0100 Subject: [PATCH 2/6] [prep-release-3.1.8] Add migration for 3.1.8-RC1 --- .../phpbb/db/migration/data/v31x/v318rc1.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v318rc1.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v318rc1.php b/phpBB/phpbb/db/migration/data/v31x/v318rc1.php new file mode 100644 index 0000000000..8bae95c7d6 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v318rc1.php @@ -0,0 +1,32 @@ + +* @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 v318rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\increase_size_of_dateformat', + '\phpbb\db\migration\data\v31x\v317pl1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.8-RC1')), + ); + } +} From e63493115aac8b744a4aa39d96ad25b97bc151ce Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 13 Feb 2016 14:57:53 +0100 Subject: [PATCH 3/6] [prep-release-3.1.8] Add changelog for 3.1.8-RC1 --- phpBB/docs/CHANGELOG.html | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 97998e7d00..980712117f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,6 +49,7 @@
  1. Changelog
      +
    • Changes since 3.1.7-PL1
    • Changes since 3.1.7
    • Changes since 3.1.6
    • Changes since 3.1.5
      • @@ -113,7 +114,41 @@
      -
      +
      + +

      Changes since 3.1.7-PL1

      + +

      Bug

      +
        +
      • [PHPBB3-12441] - Database-size in ACP missing after update MariaDB from 5.5 to 10.0
        • +
      • [PHPBB3-12618] - Extension Version Check does not support https
        • +
      • [PHPBB3-13180] - Increase the field size of date format to allow more syntax for other calendars
        • +
      • [PHPBB3-13908] - After clause in migration add_column schema tool not honored
        • +
      • [PHPBB3-14046] - Instant message (jabber) dialog says message sent on the creation screen
        • +
      • [PHPBB3-14303] - Some changes for UTF-8 variant on language pack?
        • +
      • [PHPBB3-14374] - Update dynamically generated jquery CDN script tag
        • +
      • [PHPBB3-14386] - open_basedir restriction in effect with remote upload avatar
        • +
      • [PHPBB3-14387] - Extend avatar-driver by extension in ACP not possible
        • +
      • [PHPBB3-14394] - Only purge cache in functional tests if necessary
        • +
      • [PHPBB3-14396] - Use VCHAR_UNI instead of VCHAR for user_dateformat
        • +
      • [PHPBB3-14397] - Fix @since tag in event 'core.ucp_prefs_view_after'
        • +
      • [PHPBB3-14403] - phpbb\log should still work even when no user data is given
        • +
      • [PHPBB3-14407] - Users not being removed from Newly Registered Users group
        • +
      • [PHPBB3-14411] - Delete permanently is not working as it should be
        • +
      • [PHPBB3-14423] - Display database size for Aria storage engine
        • +
      • [PHPBB3-14425] - Database tests do not allow using socket
        • +
      • [PHPBB3-14427] - Memberlist Display Wrong
        • +
      • [PHPBB3-14433] - Functional tests fail for extensions
        • +
      • [PHPBB3-14439] - Error page shown in Manage users -> Anonymous -> Select Form -> Avatar when board wide all avatar settings are disabled
        • +
      • [PHPBB3-14467] - Automatic resize of textarea calculates wrong height
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-14289] - Add events in navbar header
        • +
      • [PHPBB3-14356] - Add template events to viewtopic around back2top link
        • +
      • [PHPBB3-14412] - Comment fixes for PHPDoc in the events
        • +
      • [PHPBB3-14458] - Explicitly state RewriteBase into .htaccess root file
        • +

      Changes since 3.1.7

      From 6d5713626434d61034afd4fbb0c671d8cbe036d5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 13 Feb 2016 15:36:38 +0100 Subject: [PATCH 4/6] [ticket/14475] Do not log removal of users from newly registered group PHPBB3-14475 --- phpBB/includes/functions_user.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3e2dbcb794..bfdd1badc3 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2831,7 +2831,7 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, * * @return false if no errors occurred, else the user lang string for the relevant error, for example 'NO_USER' */ -function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $group_name = false) +function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $log_action = true) { global $db, $auth, $config, $phpbb_dispatcher, $phpbb_container; @@ -2966,16 +2966,19 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $vars = array('group_id', 'group_name', 'user_id_ary', 'username_ary'); extract($phpbb_dispatcher->trigger_event('core.group_delete_user_after', compact($vars))); - if (!$group_name) + if ($log_action) { - $group_name = get_group_name($group_id); - } + if (!$group_name) + { + $group_name = get_group_name($group_id); + } - $log = 'LOG_GROUP_REMOVE'; + $log = 'LOG_GROUP_REMOVE'; - if ($group_name) - { - add_log('admin', $log, $group_name, implode(', ', $username_ary)); + if ($group_name) + { + add_log('admin', $log, $group_name, implode(', ', $username_ary)); + } } group_update_listings($group_id); @@ -3619,8 +3622,8 @@ function remove_newly_registered($user_id, $user_data = false) } // We need to call group_user_del here, because this function makes sure everything is correctly changed. - // A downside for a call within the session handler is that the language is not set up yet - so no log entry - group_user_del($group_id, $user_id); + // Force function to not log the removal of users from newly registered users group + group_user_del($group_id, $user_id, false, false, false); // Set user_new to 0 to let this not be triggered again $sql = 'UPDATE ' . USERS_TABLE . ' From 1bd4895d7ac933257ccad48d01245025e663c197 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sat, 13 Feb 2016 14:57:04 +0100 Subject: [PATCH 5/6] [ticket/14409] Update session page info before displaying online list PHPBB3-14409 --- phpBB/includes/functions.php | 4 ++-- phpBB/includes/functions_acp.php | 4 ++-- phpBB/phpbb/session.php | 2 ++ phpBB/viewonline.php | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 094b1fd364..b6334a2bca 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4969,6 +4969,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id = } } + $user->update_session_infos(); + // Generate logged in/logged out status if ($user->data['user_id'] != ANONYMOUS) { @@ -5395,8 +5397,6 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = return; } - $user->update_session_infos(); - phpbb_check_and_display_sql_report($request, $auth, $db); $template->assign_vars(array( diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 4193f69929..2bbf1c9e57 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -55,6 +55,8 @@ function adm_page_header($page_title) return; } + $user->update_session_infos(); + // gzip_compression if ($config['gzip_compress']) { @@ -164,8 +166,6 @@ function adm_page_footer($copyright_html = true) return; } - $user->update_session_infos(); - phpbb_check_and_display_sql_report($request, $auth, $db); $template->assign_vars(array( diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 6cff75c62c..83e87b7704 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1583,6 +1583,8 @@ class session $db->sql_return_on_error(false); + $this->data = array_merge($this->data, $sql_ary); + if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts']) { $this->leave_newly_registered(); diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 87848f4485..8bfa422e26 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -85,6 +85,8 @@ if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) page_footer(); } +$user->update_session_infos(); + // Forum info $sql_ary = array( 'SELECT' => 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id', From cafd165bd03fc1abcfb5ac8058ac658d139221b7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 13 Feb 2016 16:45:51 +0100 Subject: [PATCH 6/6] [prep-release-3.1.8] Update changelog --- phpBB/docs/CHANGELOG.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 980712117f..89825d612f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -134,6 +134,7 @@
    • [PHPBB3-14397] - Fix @since tag in event 'core.ucp_prefs_view_after'
    • [PHPBB3-14403] - phpbb\log should still work even when no user data is given
    • [PHPBB3-14407] - Users not being removed from Newly Registered Users group
      • +
    • [PHPBB3-14409] - Update session page info before displaying online list
    • [PHPBB3-14411] - Delete permanently is not working as it should be
    • [PHPBB3-14423] - Display database size for Aria storage engine
    • [PHPBB3-14425] - Database tests do not allow using socket
      • @@ -141,6 +142,7 @@
    • [PHPBB3-14433] - Functional tests fail for extensions
    • [PHPBB3-14439] - Error page shown in Manage users -> Anonymous -> Select Form -> Avatar when board wide all avatar settings are disabled
    • [PHPBB3-14467] - Automatic resize of textarea calculates wrong height
      • +
    • [PHPBB3-14475] - Do not log removal of users from newly registered group

    Improvement