From fd57f020f75a19ef2f4dde32a40a3b41791c6df3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 4 Jun 2008 15:37:06 +0000
Subject: removed executable props [Bug #6464]

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8598 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/ucp.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 phpBB/ucp.php

(limited to 'phpBB/ucp.php')

diff --git a/phpBB/ucp.php b/phpBB/ucp.php
old mode 100755
new mode 100644
-- 
cgit v1.2.1


From d22e2697e9655d2fe7df8f183a68181851279f91 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 13 Jun 2008 19:39:01 +0000
Subject: Fix some instances where we left db connections open (registration ->
 captcha for example)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8655 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/ucp.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/ucp.php')

diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 1d182a713a..2b236c29c5 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -69,7 +69,7 @@ switch ($mode)
 
 	case 'confirm':
 		$module->load('ucp', 'confirm');
-		exit_handler();
+		exit;
 	break;
 
 	case 'login':
@@ -93,7 +93,7 @@ switch ($mode)
 			$message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED'];
 		}
 		meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
-	
+
 		$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> ');
 		trigger_error($message);
 
@@ -135,7 +135,7 @@ switch ($mode)
 	break;
 
 	case 'delete_cookies':
-		
+
 		// Delete Cookies with dynamic names (do NOT delete poll cookies)
 		if (confirm_box(true))
 		{
-- 
cgit v1.2.1