diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c789458494..28670b33c3 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -140,6 +140,7 @@
  • [Change] Add IN_PHPBB check to generated cache files. (reported by bantu)
  • [Change] Add topic icons to prosilver UCP main and subscribed templates (Bug #42735 - Patch by Raimon)
  • [Change] Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835)
  • +
  • [Change] Redirect to relevant MCP page of multi-page topic if accessing quickmod tools (Split option for example)
  • [Feature] Allow translation of custom BBCode help messages. (Patch by bantu)
  • [Feature] db_tools now support create table and drop table.
  • [Feature] Database updater checks for incompatible db schema (MySQL 3.x/4.x against MySQL 4.1.x/5.x/6.x)
  • diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 47578c3532..5f7aa3bd1f 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -170,6 +170,12 @@ if ($quickmod) break; case 'topic_logs': + // Reset start parameter if we jumped from the quickmod dropdown + if (request_var('start', 0)) + { + $_REQUEST['start'] = 0; + } + $module->set_active('logs', 'topic_logs'); break; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 495a536932..ebdb54fe8d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -604,7 +604,7 @@ $template->assign_vars(array( 'S_SINGLE_MODERATOR' => (!empty($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id]) > 1) ? false : true, 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"), 'S_TOPIC_MOD' => ($topic_mod != '') ? '' : '', - 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&t=$topic_id&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), + 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&t=$topic_id&start=$start&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), 'S_VIEWTOPIC' => true, 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false,