Skip to content

Commit

Permalink
Merged topics should be moved to any board visible to the merger, not…
Browse files Browse the repository at this point in the history
… only the original boards

Signed-off-by: emanuele <emanuele45@gmail.com>
  • Loading branch information
emanuele45 committed Feb 4, 2015
1 parent abf43bb commit a2f23f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sources/controllers/MergeTopics.controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public function action_mergeExecute($topics = array())

// Determine target board.
$target_board = count($boards) > 1 ? (int) $_REQUEST['board'] : $boards[0];
if (!in_array($target_board, $boards))
if (!in_array($target_board, array_keys($boards_info)))
fatal_lang_error('no_board');

// Determine which poll will survive and which polls won't.
Expand Down

0 comments on commit a2f23f8

Please sign in to comment.