From b1b542f69b3fd2f5fad3f2b757bc9a1593628c8d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 29 Jun 2007 16:36:44 +0000
Subject: [PATCH] make sure that after a cancel the redirect will work even if
 the cancel hit above failed (for whatever reason).

git-svn-id: file:///svn/phpbb/trunk@7812 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/ucp/ucp_pm_compose.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 105dda1d8c..e296ad12b1 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -345,6 +345,8 @@ function compose_pm($id, $mode, $action)
 			// "{$phpbb_root_path}ucp.$phpEx?i=pm&amp;mode=compose"
 			confirm_box(false, 'DELETE_MESSAGE', build_hidden_fields($s_hidden_fields));
 		}
+
+		redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=view&amp;action=view_message&amp;p=' . $msg_id));
 	}
 
 	// Handle User/Group adding/removing