Changeset 4495 for trunk/wp-includes/comment.php

Timestamp:

11/19/2006 07:56:05 AM (20 years ago)

Author:

ryan

Message:

Remove trailing spaces and convert spaces to tabs. Props Nazgul. fixes #986

File:

• trunk/wp-includes/comment.php (modified) (11 diffs)

trunk/wp-includes/comment.php

@@ -19 +19 @@
             if (empty($word)) { continue; }
 
-            // Do some escaping magic so that '#' chars in the 
+            // Do some escaping magic so that '#' chars in the
             // spam words don't break things:
             $word = preg_quote($word, '#');
 
-            $pattern = "#$word#i"; 
+            $pattern = "#$word#i";
             if ( preg_match($pattern, $author) ) return false;
             if ( preg_match($pattern, $email) ) return false;
@@ -104 +104 @@
         $query = "SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_ID'";
         if (false == $include_unapproved) {
-            $query .= " AND comment_approved = '1'";
-        }
-            $myrow = $wpdb->get_row($query, ARRAY_A);
+                $query .= " AND comment_approved = '1'";
+        }
+                $myrow = $wpdb->get_row($query, ARRAY_A);
     } else {
         $myrow['comment_ID'] = $postc->comment_ID;
@@ -158 +158 @@
         $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
         $comment_author_email = stripslashes($comment_author_email);
-        $comment_author_email = wp_specialchars($comment_author_email, true);   
+        $comment_author_email = wp_specialchars($comment_author_email, true);
         $_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
     }
@@ -244 +244 @@
         if ( empty($word) ) { continue; }
 
-        // Do some escaping magic so that '#' chars in the 
+        // Do some escaping magic so that '#' chars in the
         // spam words don't break things:
         $word = preg_quote($word, '#');
 
-        $pattern = "#$word#i"; 
+        $pattern = "#$word#i";
         if ( preg_match($pattern, $author    ) ) return true;
         if ( preg_match($pattern, $email     ) ) return true;
@@ -329 +329 @@
         $user_id = 0;
 
-    $result = $wpdb->query("INSERT INTO $wpdb->comments 
+    $result = $wpdb->query("INSERT INTO $wpdb->comments
     (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved, comment_agent, comment_type, comment_parent, user_id)
-    VALUES 
+    VALUES
     ('$comment_post_ID', '$comment_author', '$comment_author_email', '$comment_author_url', '$comment_author_IP', '$comment_date', '$comment_date_gmt', '$comment_content', '$comment_approved', '$comment_agent', '$comment_type', '$comment_parent', '$user_id')
     ");
@@ -398 +398 @@
 
 function wp_set_comment_status($comment_id, $comment_status) {
-    global $wpdb;
-
-    switch($comment_status) {
+        global $wpdb;
+
+        switch($comment_status) {
         case 'hold':
             $query = "UPDATE $wpdb->comments SET comment_approved='0' WHERE comment_ID='$comment_id' LIMIT 1";
@@ -407 +407 @@
             $query = "UPDATE $wpdb->comments SET comment_approved='1' WHERE comment_ID='$comment_id' LIMIT 1";
         break;
-        case 'spam':
-            $query = "UPDATE $wpdb->comments SET comment_approved='spam' WHERE comment_ID='$comment_id' LIMIT 1";
-        break;
+        case 'spam':
+            $query = "UPDATE $wpdb->comments SET comment_approved='spam' WHERE comment_ID='$comment_id' LIMIT 1";
+        break;
         case 'delete':
             return wp_delete_comment($comment_id);
@@ -415 +415 @@
         default:
             return false;
-    }
-    
-    if ($wpdb->query($query)) {
+        }
+
+        if ($wpdb->query($query)) {
         do_action('wp_set_comment_status', $comment_id, $comment_status);
 
@@ -426 +426 @@
             $wpdb->query( "UPDATE $wpdb->posts SET comment_count = '$c->c' WHERE ID = '$comment_post_ID'" );
         return true;
-    } else {
+        } else {
         return false;
-    }
+        }
 }
 
@@ -583 +583 @@
         pingback($ping->post_content, $ping->ID);
     }
-    
+
     // Do Enclosures
     while ($enclosure = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
@@ -706 +706 @@
 
         if ($pingback_server_url) {
-            @ set_time_limit( 60 ); 
+            @ set_time_limit( 60 );
              // Now, the RPC call
             debug_fwrite($log, "Page Linked To: $pagelinkedto \n");