diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-27 01:38:43 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-27 01:38:43 +0200 |
| commit | c517cd67783d02579baa1c3ca2c517169e426756 (patch) | |
| tree | 266b8957a0c46b89be3a23fe358c60b0fcad7cff /phpBB/includes | |
| parent | d20d86bf108dc889451d0f1b294dc851c23b7018 (diff) | |
| download | forums-c517cd67783d02579baa1c3ca2c517169e426756.tar forums-c517cd67783d02579baa1c3ca2c517169e426756.tar.gz forums-c517cd67783d02579baa1c3ca2c517169e426756.tar.bz2 forums-c517cd67783d02579baa1c3ca2c517169e426756.tar.xz forums-c517cd67783d02579baa1c3ca2c517169e426756.zip | |
[ticket/8610] Throw an error when the dest topic isn't set
PHPBB3-8610
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index c936d2df69..88bc404604 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -378,7 +378,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) $topic_data = get_topic_data($sync_topics, 'm_merge'); - if (!sizeof($topic_data) && empty($topic_data[$to_topic_id])) + if (!sizeof($topic_data) || empty($topic_data[$to_topic_id])) { $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); return; |