Changeset 2414

Timestamp:

03/07/2005 12:16:06 AM (20 years ago)

Author:

ryan

Message:

Do not skip whitelist checking if moderation keys are empty. ​http://mosquito.wordpress.org/view.php?id=1028 Props: ColdForged

File:

• trunk/wp-includes/comment-functions.php (modified) (1 diff)

trunk/wp-includes/comment-functions.php

@@ -728 +728 @@
 
     $mod_keys = trim( get_settings('moderation_keys') );
-    if ('' == $mod_keys )
-        return true; // If moderation keys are empty
-    $words = explode("\n", $mod_keys );
-
-    foreach ($words as $word) {
-        $word = trim($word);
-
-        // Skip empty lines
-        if (empty($word)) { continue; }
-
-        // Do some escaping magic so that '#' chars in the 
-        // spam words don't break things:
-        $word = preg_quote($word, '#');
+    if ( !empty($mod_keys) ) {
+        $words = explode("\n", $mod_keys );
+
+        foreach ($words as $word) {
+            $word = trim($word);
+
+            // Skip empty lines
+            if (empty($word)) { continue; }
+
+            // Do some escaping magic so that '#' chars in the 
+            // spam words don't break things:
+            $word = preg_quote($word, '#');
         
-        $pattern = "#$word#i"; 
-        if ( preg_match($pattern, $author) ) return false;
-        if ( preg_match($pattern, $email) ) return false;
-        if ( preg_match($pattern, $url) ) return false;
-        if ( preg_match($pattern, $comment) ) return false;
-        if ( preg_match($pattern, $user_ip) ) return false;
-        if ( preg_match($pattern, $user_agent) ) return false;
+            $pattern = "#$word#i"; 
+            if ( preg_match($pattern, $author) ) return false;
+            if ( preg_match($pattern, $email) ) return false;
+            if ( preg_match($pattern, $url) ) return false;
+            if ( preg_match($pattern, $comment) ) return false;
+            if ( preg_match($pattern, $user_ip) ) return false;
+            if ( preg_match($pattern, $user_agent) ) return false;
+        }
     }