diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
| commit | c01597499cbfbce0a429b7196a315e1643d9e5c2 (patch) | |
| tree | a93e25f2581db47848a99cbde681193e35f6f74f /phpBB/includes/mcp/mcp_warn.php | |
| parent | 14b6714c93944b6af9ec01d978cfe7f387dc7e9a (diff) | |
| download | forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.gz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.bz2 forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.xz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.zip | |
- 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
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 9872387b78..d0ffb37874 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -262,12 +262,6 @@ function mcp_warn_post_view($id, $mode, $action) // Parse the message and subject $message = $userrow['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', $userrow['forum_id']) && $row['enable_html']) - { - $message = preg_replace('#(<!\-\- h \-\-><)([\/]?.*?)(><!\-\- h \-\->)#is', "<\\2>", $message); - } - // Second parse bbcode here if ($userrow['bbcode_bitfield']) { @@ -277,12 +271,6 @@ function mcp_warn_post_view($id, $mode, $action) // Always process smilies after parsing bbcodes $message = smiley_text($message); - if ($userrow['enable_html'] && $auth->acl_get('f_html', $userrow['forum_id'])) - { - // Remove Comments from post content - $message = preg_replace('#<!\-\-(.*?)\-\->#is', '', $message); - } - // Replace naughty words such as farty pants $message = str_replace("\n", '<br />', censor_text($message)); @@ -391,7 +379,7 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0) $message_parser = new parse_message(); $message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning); $message_md5 = md5($message_parser->message); - $message_parser->parse(false, true, true, true, false, false, true); + $message_parser->parse(true, true, true, false, false, true); $pm_data = array( 'from_user_id' => $user->data['user_id'], @@ -399,7 +387,6 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0) 'from_username' => $user->data['username'], 'enable_sig' => false, 'enable_bbcode' => true, - 'enable_html' => false, 'enable_smilies' => true, 'enable_urls' => false, 'icon_id' => 0, |