mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-11 01:55:24 +02:00
Fixed bug #487801
git-svn-id: file:///svn/phpbb/trunk@1499 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
5fc368388f
commit
70942d35a2
@ -788,7 +788,7 @@ switch($mode)
|
|||||||
"split_body" => "modcp_split.tpl")
|
"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
|
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
|
||||||
WHERE p.topic_id = $topic_id
|
WHERE p.topic_id = $topic_id
|
||||||
AND p.poster_id = u.user_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);
|
$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
||||||
}
|
|
||||||
else if( !$board_config['allow_bbcode'] && $bbcode != "" )
|
|
||||||
{
|
|
||||||
$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
Loading…
x
Reference in New Issue
Block a user