Ticket #6836: wordpress_delete_wpdb.diff

wp-includes/wp-db.php

@@ -688 +688 @@
 
                 return $this->query( "UPDATE $table SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres ) );
         }
-
+        
         /**
+         * Delete rows in a table
+         * 
+         * @since 2.7
+         * 
+         * @param string $table name
+         * @param array $where A named array of WHERE column => value pairs.
+         * @return mixed Results of $this->query()
+         */
+        function delete($table, $where){
+                return $this->query( " DELETE FROM $table WHERE " . $this->make_wheres($where));
+        }
+        
+        /**
+         * Create a where clause for use in sql queries. WARNING: Only works for ANDs at the moment
+         * 
+         * @since 2.7
+         * 
+         * @param array $where A named array of WHERE column => value pairs. Multiple pairs will be joined by AND.
+         * @return string a WHERE clause for use in SQL statement
+         * */
+        function make_wheres($where){
+                $wheres = array();
+                if (is_array( $where ) )
+                        foreach ( $where as $c => $v )
+                                $wheres[] = "$c = '" . $this->escape( $v ) ."'";
+                else
+                        return false;
+                
+                return implode( ' AND ',$wheres);
+        }
+        
+        /**
          * Retrieve one variable from the database.
          *
          * This combines the functionality of wpdb::get_row() and wpdb::get_col(),

wp-admin/includes/post.php

@@ -587 +587 @@
         $post_id = $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
         wp_cache_delete($post_id, 'post_meta');
 
-        return $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
+        return $wpdb->delete($wpdb->postmeta, array("meta_id" => $mid) );
 }
 
 /**