3 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index ab863d7fc6..eec7dabf40 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -291,6 +291,8 @@ p a {
 		<li>[Fix] Allow searching for multibyte authors (Bug #11793)</li>
 		<li>[Fix] Writing directories/files with correct permissions using FTP for transfers on PHP4</li>
 		<li>[Fix] Oracle sequences during conversions are now corrected (Bug #12555)</li>
+		<li>[Fix] Allow users to continue after selecting "No" in the merge quickmod confirmation (Bug #12577)</li>
+
 	</ul>
 
 	</div>
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 4387e02739..0578170d7b 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -63,7 +63,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	}
 
 	$selected_ids = '';
-	if (sizeof($post_id_list))
+	if (sizeof($post_id_list) && $action != 'merge_topics')
 	{
 		foreach ($post_id_list as $num => $post_id)
 		{
@@ -318,6 +318,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 {
 	global $db, $template, $user, $phpEx, $phpbb_root_path, $auth;
 
+	if (!sizeof($topic_ids))
+	{
+		$template->assign_var('MESSAGE', $user->lang['NO_TOPIC_SELECTED']);
+		return;
+	}
 	if (!$to_topic_id)
 	{
 		$template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']);
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 29d364e89b..ec43c02bc9 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -414,6 +414,7 @@ class session
 			$result = $db->sql_query($sql);
 			$this->data = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
+			$bot = false;
 		}
 		else if ($user_id !== false && !sizeof($this->data))
 		{
@@ -427,8 +428,9 @@ class session
 			$result = $db->sql_query($sql);
 			$this->data = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
+			$bot = false;
 		}
-
+	
 		// If no data was returned one or more of the following occurred:
 		// Key didn't match one in the DB
 		// User does not exist