makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

hmmm, doh ... of course removing the preg_quote here is no doubt going to cause bug reports of "I can't censor xyz@asd" ...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@2065 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-02-08 01:44:27 +00:00
parent 22b58414dd
commit 543caeaa4e
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions.php
View file

@ -765,22 +765,20 @@ function obtain_word_list(&$orig_word, &$replacement_word)
// //
$sql = "SELECT word, replacement $sql = "SELECT word, replacement
FROM " . WORDS_TABLE; FROM " . WORDS_TABLE;
if( !$words_result = $db->sql_query($sql) ) if( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't get censored words from database.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Couldn't get censored words from database.", "", __LINE__, __FILE__, $sql);
} }
else
{
if ( $row = $db->sql_fetchrow($result) ) if ( $row = $db->sql_fetchrow($result) )
{ {
do do
{ {
$orig_word[] = "#\b(" . str_replace("\*", "\w*?", $row['word']) . ")\b#is"; $orig_word[] = "#\b(" . str_replace("*", "\w*?", $row['word']) . ")\b#is";
$replacement_word[] = $row['replacement']; $replacement_word[] = $row['replacement'];
} }
while ( $row = $db->sql_fetchrow($result) ); while ( $row = $db->sql_fetchrow($result) );
} }
}
return true; return true;
} }