aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_compose.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-11-03 14:40:25 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-11-03 14:40:25 +0000
commit7d4a25e73f2135fec1ff00180c34d4cf766617f7 (patch)
tree85932ab8b03b2e36db4814b832aec16132ffad6d /phpBB/includes/ucp/ucp_pm_compose.php
parentb5c4dc32848e64842077d1a35d5649a38ef194b6 (diff)
downloadforums-7d4a25e73f2135fec1ff00180c34d4cf766617f7.tar
forums-7d4a25e73f2135fec1ff00180c34d4cf766617f7.tar.gz
forums-7d4a25e73f2135fec1ff00180c34d4cf766617f7.tar.bz2
forums-7d4a25e73f2135fec1ff00180c34d4cf766617f7.tar.xz
forums-7d4a25e73f2135fec1ff00180c34d4cf766617f7.zip
Fix Bug #53505 (related to Bug #52515 and r10208) - i fixed this the "do not break other things" way, usually the fix would be using !$submit here
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10251 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 2f56bcdf7a..d9e3deaa41 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -811,7 +811,7 @@ function compose_pm($id, $mode, $action)
}
// Decode text for message display
- $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh) ? $bbcode_uid : $message_parser->bbcode_uid;
+ $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && (!sizeof($error) || (sizeof($error) && !$submit))) ? $bbcode_uid : $message_parser->bbcode_uid;
$message_parser->decode_message($bbcode_uid);