diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 16:40:41 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 16:40:41 +0200 |
| commit | c3ceafb37d42464627ca8f30081957af2c2ff967 (patch) | |
| tree | b0ce3c11a11f3dade672ae1ce2fb189733f1096d | |
| parent | 74418f230026548a3ced6e207dc11ecc3161322a (diff) | |
| parent | 624f5ae921e0cb0967f0945fbb9c071617fb9ad8 (diff) | |
| download | forums-c3ceafb37d42464627ca8f30081957af2c2ff967.tar forums-c3ceafb37d42464627ca8f30081957af2c2ff967.tar.gz forums-c3ceafb37d42464627ca8f30081957af2c2ff967.tar.bz2 forums-c3ceafb37d42464627ca8f30081957af2c2ff967.tar.xz forums-c3ceafb37d42464627ca8f30081957af2c2ff967.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14106] Fix topics sorting in MCP for topics merging.
| -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 485c9d5eec..f73973b81d 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->variable('start', 0); $topic_id_list = $request->variable('topic_id_list', array(0)); |