diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-12-03 00:23:04 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-12-03 00:23:04 +0000 |
| commit | 70942d35a2227b92b8c58748f1fc18910061ee7f (patch) | |
| tree | e1db92355414ba5e60723bb61f04f69ddea65d71 | |
| parent | 5fc368388f24966a942908c65baada3c95810700 (diff) | |
| download | forums-70942d35a2227b92b8c58748f1fc18910061ee7f.tar forums-70942d35a2227b92b8c58748f1fc18910061ee7f.tar.gz forums-70942d35a2227b92b8c58748f1fc18910061ee7f.tar.bz2 forums-70942d35a2227b92b8c58748f1fc18910061ee7f.tar.xz forums-70942d35a2227b92b8c58748f1fc18910061ee7f.zip | |
Fixed bug #487801
git-svn-id: file:///svn/phpbb/trunk@1499 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/modcp.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/modcp.php b/phpBB/modcp.php index 22b10a06af..0c3ed4d080 100644 --- a/phpBB/modcp.php +++ b/phpBB/modcp.php @@ -788,7 +788,7 @@ switch($mode) "split_body" => "modcp_split.tpl") ); - $sql = "SELECT u.username, p.*, pt.post_text, pt.post_subject, p.post_username + $sql = "SELECT u.username, p.*, pt.post_text, pt.bbcode_uid, pt.post_subject, p.post_username FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt WHERE p.topic_id = $topic_id AND p.poster_id = u.user_id @@ -849,13 +849,9 @@ switch($mode) } } - if( $board_config['allow_bbcode'] && $bbcode_uid != "" ) + if( $bbcode_uid != "" ) { - $message = bbencode_second_pass($message, $bbcode_uid); - } - else if( !$board_config['allow_bbcode'] && $bbcode != "" ) - { - $message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message); + $message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message); } // |