Index: src/wp-includes/comment.php
===================================================================
--- src/wp-includes/comment.php	(revision 31271)
+++ src/wp-includes/comment.php	(working copy)
@@ -78,8 +78,9 @@
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
+			if ( empty($word) ) {
 				continue;
+			}	
 
 			/*
 			 * Do some escaping magic so that '#' (number of) characters in the spam
@@ -108,15 +109,16 @@
 	 * as well as whether there are any moderation keywords (if set) present in the author
 	 * email address. If both checks pass, return true. Otherwise, return false.
 	 */
-	if ( 1 == get_option('comment_whitelist')) {
+	if ( get_option('comment_whitelist') == 1 ) {
 		if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) ) {
 					return true;
-			else
+			} else {
 				return false;
+			}
 		} else {
 			return false;
 		}