diff options
| author | rxu <rxu@mail.ru> | 2015-08-16 19:55:00 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2015-08-16 19:55:00 +0700 |
| commit | ec032733de6e693874a6cc74ad5e11f49303a362 (patch) | |
| tree | 1cf1819c314c0717bfb9bff3ee7253e3eab1c5e1 /phpBB/includes | |
| parent | dead984f5456c3de5e5837680a61272289ce4a15 (diff) | |
| download | forums-ec032733de6e693874a6cc74ad5e11f49303a362.tar forums-ec032733de6e693874a6cc74ad5e11f49303a362.tar.gz forums-ec032733de6e693874a6cc74ad5e11f49303a362.tar.bz2 forums-ec032733de6e693874a6cc74ad5e11f49303a362.tar.xz forums-ec032733de6e693874a6cc74ad5e11f49303a362.zip | |
[ticket/14106] Fix topics sorting in MCP for topics merging.
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.
PHPBB3-14106
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 157134b09e..6faf0de35b 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -35,15 +35,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info) // merge_topic is the quickmod action, merge_topics is the mcp_forum action, and merge_select is the mcp_topic action $merge_select = ($action == 'merge_select' || $action == 'merge_topic' || $action == 'merge_topics') ? true : false; - if ($merge_select) - { - // Fixes a "bug" that makes forum_view use the same ordering as topic_view - $request->overwrite('sk', null); - $request->overwrite('sd', null); - $request->overwrite('sk', null, \phpbb\request\request_interface::POST); - $request->overwrite('sd', null, \phpbb\request\request_interface::POST); - } - $forum_id = $forum_info['forum_id']; $start = request_var('start', 0); $topic_id_list = request_var('topic_id_list', array(0)); |