Fix some instances where we left db connections open (registration -> captcha for example)

git-svn-id: file:///svn/phpbb/trunk@8656 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/acp/acp_captcha.php

@@ -52,9 +52,8 @@ class acp_captcha
 			{
 				include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_non_gd.' . PHP_EXT);
 			}
-
 			captcha::execute(gen_rand_string(mt_rand(5, 8)), time());
-			exit();
+			exit;
 		}
 
 		$config_vars = array(

phpBB/includes/acp/acp_forums.php

@@ -55,7 +55,7 @@ class acp_forums
 				$total = request_var('total', 0);
 
 				$this->display_progress_bar($start, $total);
-				exit_handler();
+				exit;
 			break;
 
 			case 'delete':

phpBB/includes/ucp/ucp_confirm.php

@@ -72,7 +72,9 @@ class ucp_confirm
 		}
 
 		captcha::execute($row['code'], $row['seed']);
-		exit;
+
+		garbage_collection();
+		exit_handler();
 	}
 }
 

phpBB/mcp.php

@@ -166,7 +166,7 @@ if ($quickmod)
 		case 'delete_post':
 		case 'delete_topic':
 			$module->load('mcp', 'main', 'quickmod');
-			exit_handler();
+			exit;
 		break;
 
 		case 'topic_logs':

phpBB/posting.php

@@ -114,8 +114,7 @@ switch ($mode)
 		else
 		{
 			upload_popup();
-			garbage_collection();
-			exit_handler();
+			exit;
 		}
 	break;
 
@@ -146,7 +145,7 @@ if (!$post_data)
 if ($mode == 'popup')
 {
 	upload_popup($post_data['forum_style']);
-	exit_handler();
+	exit;
 }
 
 $user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
@@ -277,7 +276,7 @@ if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id))
 if ($mode == 'delete')
 {
 	handle_post_delete($forum_id, $topic_id, $post_id, $post_data);
-	exit_handler();
+	exit;
 }
 
 // Handle bump mode...
@@ -1402,6 +1401,9 @@ function upload_popup($forum_style = 0)
 	);
 
 	$template->display('popup');
+
+	garbage_collection();
+	exit_handler();
 }
 
 /**

phpBB/ucp.php

@@ -69,7 +69,7 @@ switch ($mode)
 
 	case 'confirm':
 		$module->load('ucp', 'confirm');
-		exit_handler();
+		exit;
 	break;
 
 	case 'login':