Wordpress 3.5.2

[autoinstalls/wordpress.git] / wp-includes / wp-db.php

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 391cfa4dc96fd6e027b539f059ac1245be20f18a..4fc829fb6c56510ec81c82f32726018e12473d42 100644 (file)
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -987,10 +987,13 @@ class wpdb {
         * @return null|false|string Sanitized query string, null if there is no query, false if there is an error and string
         *      if there was something to prepare
         */
         * @return null|false|string Sanitized query string, null if there is no query, false if there is an error and string
         *      if there was something to prepare
         */

-       function prepare( $query, $args ) {
+       function prepare( $query, $args = null ) {

                if ( is_null( $query ) )
                        return;
 
                if ( is_null( $query ) )
                        return;
 

+               if ( func_num_args() < 2 )
+                       _doing_it_wrong( 'wpdb::prepare', 'wpdb::prepare() requires at least two arguments.', '3.5' );
+

                $args = func_get_args();
                array_shift( $args );
                // If args were passed as an array (as in vsprintf), move them up
                $args = func_get_args();
                array_shift( $args );
                // If args were passed as an array (as in vsprintf), move them up


@@ -1117,6 +1120,8 @@ class wpdb {
                $this->last_result = array();
                $this->col_info    = null;
                $this->last_query  = null;
                $this->last_result = array();
                $this->col_info    = null;
                $this->last_query  = null;

+               $this->rows_affected = $this->num_rows = 0;
+               $this->last_error  = '';

 
                if ( is_resource( $this->result ) )
                        mysql_free_result( $this->result );
 
                if ( is_resource( $this->result ) )
                        mysql_free_result( $this->result );


@@ -1297,6 +1302,7 @@ class wpdb {
        function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
                if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) )
                        return false;
        function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
                if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) )
                        return false;

+               $this->insert_id = 0;

                $formats = $format = (array) $format;
                $fields = array_keys( $data );
                $formatted_fields = array();
                $formats = $format = (array) $format;
                $fields = array_keys( $data );
                $formatted_fields = array();