Ticket #6836: 6836.3.diff

wp-admin/includes/schema.php

@@ -258 +258 @@
 
         // Set up a few options not to load by default
         $fatoptions = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
-        foreach ($fatoptions as $fatoption) :
-                $wpdb->query("UPDATE $wpdb->options SET `autoload` = 'no' WHERE option_name = '$fatoption'");
-        endforeach;
+        foreach ($fatoptions as $fatoption)
+                $wpdb->update( $wpdb->options, array('autoload' => 'no'), array('option_name' => $fatoption) );
 }
 
 function populate_roles() {
@@ -423 +422 @@
         }
 }
 
-?>
+?>
+ No newline at end of file

wp-admin/includes/upgrade.php

@@ -61 +61 @@
         global $wpdb;
 
         // Default category
-        $cat_name = $wpdb->escape(__('Uncategorized'));
+        $cat_name = __('Uncategorized');
         $cat_slug = sanitize_title(_c('Uncategorized|Default category slug'));
-        $wpdb->query("INSERT INTO $wpdb->terms (name, slug, term_group) VALUES ('$cat_name', '$cat_slug', '0')");
-        $wpdb->query("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ('1', 'category', '', '0', '1')");
+        
+        $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+        $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '1', 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
 
         // Default link category
-        $cat_name = $wpdb->escape(__('Blogroll'));
+        $cat_name = __('Blogroll');
         $cat_slug = sanitize_title(_c('Blogroll|Default link category slug'));
-        $wpdb->query("INSERT INTO $wpdb->terms (name, slug, term_group) VALUES ('$cat_name', '$cat_slug', '0')");
-        $wpdb->query("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ('2', 'link_category', '', '0', '7')");
+        
+        $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+        $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '2', 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
 
         // Now drop in some default links
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://codex.wordpress.org/', 'Documentation', 0, '', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (1, 2)" );
+        $default_links = array();
+        $default_links[] = array(       'link_url' => 'http://codex.wordpress.org/',
+                                                                'link_name' => 'Documentation',
+                                                                'link_category' => 0,
+                                                                'link_rss' => '',
+                                                                'link_notes' => '');
 
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://wordpress.org/development/', 'Development Blog', 0, 'http://wordpress.org/development/feed/', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (2, 2)" );
+        $default_links[] = array(       'link_url' => 'http://wordpress.org/development/',
+                                                                'link_name' => 'Development Blog', 
+                                                                'link_category' => 0,
+                                                                'link_rss' => 'http://wordpress.org/development/feed/',
+                                                                'link_notes' => '');
 
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://wordpress.org/extend/ideas/', 'Suggest Ideas', 0, '', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (3, 2)" );
+        $default_links[] = array(       'link_url' => 'http://wordpress.org/extend/ideas/',
+                                                                'link_name' => 'Suggest Ideas',
+                                                                'link_category' => 0,
+                                                                'link_rss' => '',
+                                                                'link_notes' =>'');
 
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://wordpress.org/support/', 'Support Forum', 0, '', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (4, 2)" );
+        $default_links[] = array(       'link_url' => 'http://wordpress.org/support/',
+                                                                'link_name' => 'Support Forum',
+                                                                'link_category' => 0,
+                                                                'link_rss' => '',
+                                                                'link_notes' =>'');
 
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://wordpress.org/extend/plugins/', 'Plugins', 0, '', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (5, 2)" );
+        $default_links[] = array(       'link_url' => 'http://wordpress.org/extend/plugins/',
+                                                                'link_name' => 'Plugins',
+                                                                'link_category' => 0,
+                                                                'link_rss' => '',
+                                                                'link_notes' =>'');
 
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://wordpress.org/extend/themes/', 'Themes', 0, '', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (6, 2)" );
+        $default_links[] = array(       'link_url' => 'http://wordpress.org/extend/themes/',
+                                                                'link_name' => 'Themes',
+                                                                'link_category' => 0,
+                                                                'link_rss' => '',
+                                                                'link_notes' =>'');
 
-        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://planet.wordpress.org/', 'WordPress Planet', 0, '', '');");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (7, 2)" );
+        $default_links[] = array(       'link_url' => 'http://planet.wordpress.org/',
+                                                                'link_name' => 'WordPress Planet',
+                                                                'link_category' => 0,
+                                                                'link_rss' => '',
+                                                                'link_notes' =>'');
+        foreach($default_links as $link){
+                $wpdb->insert( $wpdb->links, $link);
+                $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 2, 'object_id' => $wpdb->insert_id) );
+        }
 
         // First post
         $now = date('Y-m-d H:i:s');
         $now_gmt = gmdate('Y-m-d H:i:s');
         $first_post_guid = get_option('home') . '/?p=1';
-        $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, guid, comment_count, to_ping, pinged, post_content_filtered) VALUES ($user_id, '$now', '$now_gmt', '".$wpdb->escape(__('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'))."', '', '".$wpdb->escape(__('Hello world!'))."', '0', '".$wpdb->escape(_c('hello-world|Default post slug'))."', '$now', '$now_gmt', '$first_post_guid', '1', '', '', '')");
-        $wpdb->query( "INSERT INTO $wpdb->term_relationships (`object_id`, `term_taxonomy_id`) VALUES (1, 1)" );
+        
+        $wpdb->insert( $wpdb->posts, array(
+                                                                'post_author' => $user_id,
+                                                                'post_date' => $now,
+                                                                'post_date_gmt' => $now_gmt,
+                                                                'post_content' => __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'),
+                                                                'post_excerpt' => '',
+                                                                'post_title' => __('Hello world!'),
+                                                                'post_category' => 0,
+                                                                'post_name' => _c('hello-world|Default post slug'),
+                                                                'post_modified' => $now,
+                                                                'post_modified_gmt' => $now_gmt,
+                                                                'guid' => $first_post_guid,
+                                                                'comment_count' => 1,
+                                                                'to_ping' => '', 
+                                                                'pinged' => '',
+                                                                'post_content_filtered' => ''
+                                                                ));
+        $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 1, 'object_id' => 1) );
 
         // Default comment
-        $wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".$wpdb->escape(__('Mr WordPress'))."', '', 'http://wordpress.org/', '$now', '$now_gmt', '".$wpdb->escape(__('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.'))."')");
-
+        $wpdb->insert( $wpdb->comments, array(
+                                                                'comment_post_ID' => 1,
+                                                                'comment_author' => __('Mr WordPress'),
+                                                                'comment_author_email' => '',
+                                                                'comment_author_url' => 'http://wordpress.org/',
+                                                                'comment_date' => $now,
+                                                                'comment_date_gmt' => $now_gmt,
+                                                                'comment_content' => __('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.')
+                                                                ));
         // First Page
         $first_post_guid = get_option('home') . '/?page_id=2';
-        $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, guid, post_status, post_type, to_ping, pinged, post_content_filtered) VALUES ($user_id, '$now', '$now_gmt', '".$wpdb->escape(__('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'))."', '', '".$wpdb->escape(__('About'))."', '0', '".$wpdb->escape(_c('about|Default page slug'))."', '$now', '$now_gmt','$first_post_guid', 'publish', 'page', '', '', '')");
+        $wpdb->insert( $wpdb->posts, array(
+                                                                'post_author' => $user_id,
+                                                                'post_date' => $now,
+                                                                'post_date_gmt' => $now_gmt,
+                                                                'post_content' => __('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'),
+                                                                'post_excerpt' => '',
+                                                                'post_title' => __('About'),
+                                                                'post_category' => '',
+                                                                'post_name' => _c('about|Default page slug'),
+                                                                'post_modified' => $now,
+                                                                'post_modified_gmt' => $now_gmt,
+                                                                'guid' => $first_post_guid,
+                                                                'post_type' => 'page',
+                                                                'to_ping' => '', 
+                                                                'pinged' => '',
+                                                                'post_content_filtered' => ''
+                                                                ));
 }
 endif;
 
@@ -230 +298 @@
         foreach ($categories as $category) {
                 if ('' == $category->category_nicename) {
                         $newtitle = sanitize_title($category->cat_name);
-                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->categories SET category_nicename = %s WHERE cat_ID = %d", $newtitle, $category->cat_ID) );
+                        $wpdb>update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
                 }
         }
 
@@ -255 +323 @@
                         // Check to see if it's already been imported
                         $cat = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category) );
                         if (!$cat && 0 != $post->post_category) { // If there's no result
-                                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->post2cat
-                                        (post_id, category_id)
-                                        VALUES (%s, %s)
-                                        ", $post->ID, $post->post_category) );
+                                $wpdb->insert( $wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category) );
                         }
                 }
         endif;
@@ -286 +351 @@
         foreach ($users as $user) {
                 if ('' == $user->user_nicename) {
                         $newname = sanitize_title($user->user_nickname);
-                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->users SET user_nicename = %s WHERE ID = %d", $newname, $user->ID) );
+                        $wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
                 }
         }
 
         $users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
         foreach ($users as $row) {
                 if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-                        $wpdb->query('UPDATE '.$wpdb->users.' SET user_pass = MD5(\''.$row->user_pass.'\') WHERE ID = \''.$row->ID.'\'');
+                        $wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
                 }
         }
 
@@ -349 +414 @@
                         else
                                 $guid = $post->guid;
 
-                        $wpdb->query("UPDATE $wpdb->posts SET post_title = '$post_title', post_content = '$post_content', post_excerpt = '$post_excerpt', guid = '$guid' WHERE ID = '$post->ID'");
+                        $wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+
                 }
         }
 
@@ -357 +423 @@
         $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
         if ($comments) {
                 foreach($comments as $comment) {
-                        $comment_content = addslashes(deslash($comment->comment_content));
-                        $comment_author = addslashes(deslash($comment->comment_author));
-                        $wpdb->query("UPDATE $wpdb->comments SET comment_content = '$comment_content', comment_author = '$comment_author' WHERE comment_ID = '$comment->comment_ID'");
+                        $comment_content = deslash($comment->comment_content);
+                        $comment_author = deslash($comment->comment_author);
+                        
+                        $wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
                 }
         }
 
@@ -367 +434 @@
         $links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
         if ($links) {
                 foreach($links as $link) {
-                        $link_name = addslashes(deslash($link->link_name));
-                        $link_description = addslashes(deslash($link->link_description));
-                        $wpdb->query("UPDATE $wpdb->links SET link_name = '$link_name', link_description = '$link_description' WHERE link_id = '$link->link_id'");
+                        $link_name = deslash($link->link_name);
+                        $link_description = deslash($link->link_description);
+                        
+                        $wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
                 }
         }
 
         // The "paged" option for what_to_show is no more.
-        if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') {
-                $wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
-        }
+        if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged')
+                $wpdb->update( $wpdb->options, array('option_value' => 'posts'), array('option_name' => 'what_to_show') );
 
         $active_plugins = __get_option('active_plugins');
 
@@ -446 +513 @@
                         if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
                         if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
                         if (!$idmode) $id = $user->user_nickname;
-                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->users SET display_name = %s WHERE ID = %d", $id, $user->ID) );
+                        $wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
                 endif;
 
                 // FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
@@ -466 +533 @@
 
         // populate comment_count field of posts table
         $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-        if( is_array( $comments ) ) {
-                foreach ($comments as $comment) {
-                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET comment_count = %d WHERE ID = %d", $comment->c, $comment->comment_post_ID) );
-                }
-        }
+        if( is_array( $comments ) )
+                foreach ($comments as $comment)
+                        $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
 
         // Some alpha versions used a post status of object instead of attachment and put
         // the mime type in post_type instead of post_mime_type.
         if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
                 $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
                 foreach ($objects as $object) {
-                        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = 'attachment',
-                        post_mime_type = %s,
-                        post_type = ''
-                        WHERE ID = %d", $object->post_type, $object->ID) );
+                        $wpdb->update( $wpdb->posts, array(     'post_status' => 'attachment',
+                                                                                                'post_mime_type' => $object->post_type, 
+                                                                                                'post_type' => ''),
+                                                                                 array( 'ID' => $object->ID ) );
 
                         $meta = get_post_meta($object->ID, 'imagedata', true);
                         if ( ! empty($meta['file']) )
@@ -558 +623 @@
 
                         if ( empty( $term_group ) ) {
                                 $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
-                                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+                                $wpdb->update( $wpdb->terms, compact('term_group'), array('term_id' => $id) );
                         }
                 }
 
-                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES 
-                (%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
+                $wpdb->insert( $wpdb->terms, compact('term_id', 'name', 'slug', 'term_group') );
 
                 $count = 0;
                 if ( !empty($category->category_count) ) {
                         $count = (int) $category->category_count;
                         $taxonomy = 'category';
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+                        $wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
                 }
 
                 if ( !empty($category->link_count) ) {
                         $count = (int) $category->link_count;
                         $taxonomy = 'link_category';
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+                        $wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
                 }
 
@@ -584 +648 @@
                         $have_tags = true;
                         $count = (int) $category->tag_count;
                         $taxonomy = 'post_tag';
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+                        $wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
                 }
 
                 if ( empty($count) ) {
                         $count = 0;
                         $taxonomy = 'category';
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+                        $wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
                         $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
                 }
         }
@@ -611 +675 @@
                 if ( empty($tt_id) )
                         continue;
 
-                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES ( %d, %d)", $post_id, $tt_id) );
+                $wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
         }
 
         // < 3570 we used linkcategories.  >= 3570 we used categories and link2cat.
@@ -636 +700 @@
                         }
 
                         if ( empty($term_id) ) {
-                                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (name, slug, term_group) VALUES (%s, %s, %d)", $name, $slug, $term_group) );
+                                $wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
                                 $term_id = (int) $wpdb->insert_id;
                         }
 
                         $link_cat_id_map[$cat_id] = $term_id;
                         $default_link_cat = $term_id;
 
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES (%d, 'link_category', '', '0', '0')", $term_id) );
+                        $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
                         $tt_ids[$term_id] = (int) $wpdb->insert_id;
                 }
 
@@ -659 +723 @@
                         if ( empty($tt_id) )
                                 continue;
 
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES ( %d, %d)", $link->link_id, $tt_id) );
+                        $wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
                 }
 
                 // Set default to the last category we grabbed during the upgrade loop.
@@ -673 +737 @@
                         $tt_id = $tt_ids[$term_id][$taxonomy];
                         if ( empty($tt_id) )
                                 continue;
-
-                        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES ( %d, %d)", $link_id, $tt_id) );
+                        $wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
                 }
         }
 
@@ -690 +753 @@
                         $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
                 else
                         $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
-                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET count = %d WHERE term_taxonomy_id = %d", $count, $term->term_taxonomy_id) );
+                $wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
         }
 }
 
@@ -713 +776 @@
 function upgrade_old_slugs() {
         // upgrade people who were using the Redirect Old Slugs plugin
         global $wpdb;
-        $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'");
+        $wpdb->update( $wpdb->postmeta, array('meta_key' => '_wp_old_slug'), array('meta_key' => 'old_slug') );
 }
 
 
 function upgrade_250() {
         global $wp_current_db_version;
 
-        if ( $wp_current_db_version < 6689 ) {
+        if ( $wp_current_db_version < 6689 )
                 populate_roles_250();
-        }
-        
 }
 
 function upgrade_251() {