From c517cd67783d02579baa1c3ca2c517169e426756 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 27 May 2014 01:38:43 +0200 Subject: [PATCH] [ticket/8610] Throw an error when the dest topic isn't set PHPBB3-8610 --- phpBB/includes/mcp/mcp_forum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;