From ad4d7c036eb144559bbce553afa4952587c28e56 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 30 Sep 2008 15:18:35 +0000
Subject: merge r8956, r8957 and r8960

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

(limited to 'phpBB/posting.php')

diff --git a/phpBB/posting.php b/phpBB/posting.php
index fc173e7dbd..1ec693e16f 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -120,7 +120,7 @@ switch ($mode)
 		else
 		{
 			upload_popup();
-			exit;
+			return;
 		}
 	break;
 
@@ -151,7 +151,7 @@ if (!$post_data)
 if ($mode == 'popup')
 {
 	upload_popup($post_data['forum_style']);
-	exit;
+	return;
 }
 
 $user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
@@ -282,7 +282,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;
+	return;
 }
 
 // Handle bump mode...
-- 
cgit v1.2.1