mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 03:34:04 +02:00
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)
- fixed forum editing and parent id selection - completely removed HTML support (it only creates security problems) - changed cache_moderators() to reflect permission changes git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -818,7 +818,6 @@ while ($row = $db->sql_fetchrow($result))
|
||||
'post_encoding' => $row['post_encoding'],
|
||||
'bbcode_uid' => $row['bbcode_uid'],
|
||||
'bbcode_bitfield' => $row['bbcode_bitfield'],
|
||||
'enable_html' => $row['enable_html'],
|
||||
'enable_smilies' => $row['enable_smilies'],
|
||||
'enable_sig' => $row['enable_sig'],
|
||||
'friend' => $row['friend'],
|
||||
@@ -1139,12 +1138,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
|
||||
// Parse the message and subject
|
||||
$message = $row['post_text'];
|
||||
|
||||
// If the board has HTML off but the post has HTML on then we process it, else leave it alone
|
||||
if (!$auth->acl_get('f_html', $forum_id) && $row['enable_html'])
|
||||
{
|
||||
$message = preg_replace('#(<!\-\- h \-\-><)([\/]?.*?)(><!\-\- h \-\->)#is', "<\\2>", $message);
|
||||
}
|
||||
|
||||
// Second parse bbcode here
|
||||
if ($row['bbcode_bitfield'])
|
||||
{
|
||||
@@ -1171,12 +1164,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
|
||||
$message = preg_replace('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*>)#i', '<span class="posthilit">\1</span>', $message);
|
||||
}
|
||||
|
||||
if ($row['enable_html'] && $auth->acl_get('f_html', $forum_id))
|
||||
{
|
||||
// Remove Comments from post content
|
||||
$message = preg_replace('#<!\-\-(.*?)\-\->#is', '', $message);
|
||||
}
|
||||
|
||||
// Replace naughty words such as farty pants
|
||||
$row['post_subject'] = censor_text($row['post_subject']);
|
||||
$message = str_replace("\n", '<br />', censor_text($message));
|
||||
|
Reference in New Issue
Block a user