From 331a549c42a74472d27dadbe213618a7b914a737 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Thu, 29 Mar 2007 15:18:10 +0000
Subject: [PATCH] #5315

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

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index f121c1d638..6df48c8c3e 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -505,9 +505,21 @@ function compose_pm($id, $mode, $action)
 		// Parse Attachments - before checksum is calculated
 		$message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
 
+		if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
+		{
+			$error[] = implode('<br />', $message_parser->warn_msg);
+			$message_parser->warn_msg = array();
+		}
+
 		// Parse message
 		$message_parser->parse($enable_bbcode, ($config['allow_post_links']) ? $enable_urls : false, $enable_smilies, $img_status, $flash_status, true, $config['allow_sig_links']);
 
+		// On a refresh we do not care about message parsing errors
+		if (sizeof($message_parser->warn_msg) && !$refresh)
+		{
+			$error[] = implode('<br />', $message_parser->warn_msg);
+		}
+
 		if ($action != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('u_ignoreflood'))
 		{
 			// Flood check
@@ -536,17 +548,6 @@ function compose_pm($id, $mode, $action)
 			}
 		}
 
-		// On a refresh we do not care about message parsing errors
-		if (sizeof($message_parser->warn_msg) && $refresh)
-		{
-			$message_parser->warn_msg = array();
-		}
-
-		if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
-		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
-		}
-
 		// Store message, sync counters
 		if (!sizeof($error) && $submit)
 		{