git-svn-id: file:///svn/phpbb/trunk@7058 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-02-25 05:38:15 +00:00
parent 99b6c76aae
commit 6f426ddf0f
2 changed files with 8 additions and 1 deletions

View file

@ -528,6 +528,12 @@ 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);

View file

@ -408,7 +408,8 @@ if ($user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
$sql = 'SELECT draft_id
FROM ' . DRAFTS_TABLE . '
WHERE (forum_id IN (' . $forum_id . ', 0)' . (($topic_id) ? " OR topic_id = $topic_id" : '') . ')
AND user_id = ' . $user->data['user_id'] .
AND (forum_id <> 0 AND topic_id <> 0)
AND user_id = ' . $user->data['user_id'] .
(($draft_id) ? " AND draft_id <> $draft_id" : '');
$result = $db->sql_query_limit($sql, 1);