Changeset 10731

Timestamp:

03/06/2009 05:06:15 AM (16 years ago)

Author:

ryan

Message:

Use wpdb::insert() and update(). see #6836

Location:

trunk

Files:

• wp-admin/comment.php (modified) (1 diff)
• wp-admin/update-links.php (modified) (1 diff)
• wp-includes/comment.php (modified) (4 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -217 +217 @@
 
     $comment_id = absint( $_POST['comment_ID'] );
-    $comment_post_id = absint( $_POST['comment_post_id'] );
+    $comment_post_id = absint( $_POST['comment_post_ID'] );
 
     check_admin_referer( 'update-comment_' . $comment_id );

trunk/wp-admin/update-links.php

@@ -48 +48 @@
 $returns = explode("\n", $body);
 
-foreach ($returns as $return) :
+foreach ($returns as $return) {
     $time = substr($return, 0, 19);
     $uri = preg_replace('/(.*?) | (.*?)/', '$2', $return);
-    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_updated = %s WHERE link_url = %s", $time, $uri) );
-endforeach;
+    $wdpdb->update( $wpdb->links, array('link_updated' => $time), array('link_url' => $uri) );
+}
 
 ?>

trunk/wp-includes/comment.php

@@ -881 +881 @@
         $comment_type = '';
 
-    $result = $wpdb->query( $wpdb->prepare("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_karma, comment_approved, comment_agent, comment_type, comment_parent, user_id)
-    VALUES (%d, %s, %s, %s, %s, %s, %s, %s, %d, %s, %s, %s, %d, %d)",
-    $comment_post_ID, $comment_author, $comment_author_email, $comment_author_url, $comment_author_IP, $comment_date, $comment_date_gmt, $comment_content, $comment_karma, $comment_approved, $comment_agent, $comment_type, $comment_parent, $user_id) );
+    $data = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id');
+    $wpdb->insert($wpdb->comments, $data);
 
     $id = (int) $wpdb->insert_id;
 
-    if ( $comment_approved == 1)
+    if ( $comment_approved == 1 )
         wp_update_comment_count($comment_post_ID);
 
@@ -1081 +1079 @@
 
     // Escape data pulled from DB.
-    foreach ( (array) $comment as $key => $value )
-        $comment[$key] = $wpdb->escape($value);
+    $comment = $wpdb->escape($comment);
 
     // Merge old and new fields with new fields overwriting old ones.
@@ -1103 +1100 @@
         $comment_approved = 1;
 
-    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->comments SET
-            comment_content      = %s,
-            comment_author       = %s,
-            comment_author_email = %s,
-            comment_approved     = %s,
-            comment_karma        = %d,
-            comment_author_url   = %s,
-            comment_date         = %s,
-            comment_date_gmt     = %s
-        WHERE comment_ID = %d",
-            $comment_content,
-            $comment_author,
-            $comment_author_email,
-            $comment_approved,
-            $comment_karma,
-            $comment_author_url,
-            $comment_date,
-            $comment_date_gmt,
-            $comment_ID) );
+    $data = compact('comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt');
+    $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
 
     $rval = $wpdb->rows_affected;
@@ -1220 +1200 @@
     $old = (int) $post->comment_count;
     $new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
-    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET comment_count = %d WHERE ID = %d", $new, $post_id) );
+    $wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
 
     if ( 'page' == $post->post_type )

trunk/wp-settings.php

@@ -255 +255 @@
     'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'commment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
     'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
-    'user_status' => '%d', 'umeta_id' => '%d');
+    'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d');
 
 require_wp_db();