diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
| commit | 4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff (patch) | |
| tree | 477b69dc84a7ec7efc9c8de15b7b28b952320ec7 /phpBB/posting.php | |
| parent | 30fd2486d82d50fecd4ba5ec6b81eebc4fcfdf49 (diff) | |
| download | forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.gz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.bz2 forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.xz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.zip | |
a few updates, added #539865 and #694413.
git-svn-id: file:///svn/phpbb/trunk@4005 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 2864310d61..cf52fdb822 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -650,9 +650,11 @@ if ($submit || $preview || $refresh) } } - if (($result = $message_parser->parse_attachments($mode, $post_id, $submit, $preview, $refresh)) != '') + $result = $message_parser->parse_attachments($mode, $post_id, $submit, $preview, $refresh); + + if (count($result)) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $result; + $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . implode('<br />', $result); } if ($mode != 'edit' && !$preview && !$refresh && !$perm['f_ignoreflood']) @@ -822,11 +824,11 @@ if ($preview) $bbcode = new bbcode($message_parser->bbcode_bitfield); $preview_message = format_display($message_parser->message, $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, $enable_sig); - + $preview_subject = (sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $subject) : $subject; // Poll Preview - if ( ( ($mode == 'post') || ( ($mode == 'edit') && ($post_id == $topic_first_post_id) && (empty($poll_last_vote)) )) && ( ($auth->acl_get('f_poll', $forum_id)) || ($auth->acl_get('m_edit', $forum_id)) )) + if ( ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id && empty($poll_last_vote))) && ($auth->acl_get('f_poll', $forum_id) || $auth->acl_get('m_edit', $forum_id)) ) { decode_text($poll_title, $message_parser->bbcode_uid); $preview_poll_title = format_display(stripslashes($poll_title), $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, false, false); |