From a363e8dcdb52558366d6242caf3d22b93cb8ce09 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 9 Sep 2003 07:02:57 +0000 Subject: fixed censoring (quote post, word boundaries, attachment comments) git-svn-id: file:///svn/phpbb/trunk@4492 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index c79edcebc1..fdabc7cb08 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -119,6 +119,12 @@ switch ($mode) trigger_error($user->lang['NO_MODE']); } +if (empty($censors)) +{ + $censors = array(); + obtain_word_list($censors); +} + if ($sql != '') { $result = $db->sql_query($sql); @@ -749,12 +755,6 @@ if ($submit || $preview || $refresh) // Preview if (!sizeof($error) && $preview) { - if (empty($censors)) - { - $censors = array(); - obtain_word_list($censors); - } - $post_time = ($mode == 'edit') ? $post_time : $current_time; $preview_subject = (sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $subject) : $subject; @@ -824,13 +824,13 @@ if (count($poll_options)) if ($mode == 'quote' && !$preview && !$refresh) { - $post_text = '[quote="' . $quote_username . '"]' . trim($post_text) . "[/quote]\n"; + $post_text = '[quote="' . $quote_username . '"]' . ((sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], trim($post_text)) : trim($post_text)) . "[/quote]\n"; } if (($mode == 'reply' || $mode == 'quote') && !$preview && !$refresh) { - $post_subject = ((!preg_match('/^Re:/', $post_subject)) ? 'Re: ' : '') . $post_subject; + $post_subject = ((!preg_match('/^Re:/', $post_subject)) ? 'Re: ' : '') . ((sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $post_subject) : $post_subject); } -- cgit v1.2.1