diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 16:40:33 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 16:40:33 +0200 |
| commit | 624f5ae921e0cb0967f0945fbb9c071617fb9ad8 (patch) | |
| tree | 2b19821ea31b54845aa4fdee888c1769bea54dec /phpBB/includes | |
| parent | 6d7a5dfe5e9bdf6d3321e5a8bf881e1ab88edb02 (diff) | |
| parent | ec032733de6e693874a6cc74ad5e11f49303a362 (diff) | |
| download | forums-624f5ae921e0cb0967f0945fbb9c071617fb9ad8.tar forums-624f5ae921e0cb0967f0945fbb9c071617fb9ad8.tar.gz forums-624f5ae921e0cb0967f0945fbb9c071617fb9ad8.tar.bz2 forums-624f5ae921e0cb0967f0945fbb9c071617fb9ad8.tar.xz forums-624f5ae921e0cb0967f0945fbb9c071617fb9ad8.zip | |
Merge pull request #3835 from rxu/ticket/14106
[ticket/14106] Fix topics sorting in MCP for topics merging.
* rxu/ticket/14106:
[ticket/14106] Fix topics sorting in MCP for topics merging.
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)); |