WordPress 3.8

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

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 2398002e323dcc9519f71a29a972113a83688d1f..9fcd4a7cab9653439858653a42940e01eba89221 100644 (file)
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -1139,7 +1139,15 @@ class wpdb {
                $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
 
                if ( WP_DEBUG ) {
+                       $error_reporting = false;
+                       if ( defined( 'E_DEPRECATED' ) ) {
+                               $error_reporting = error_reporting();
+                               error_reporting( $error_reporting ^ E_DEPRECATED );
+                       }
                        $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
+                       if ( false !== $error_reporting ) {
+                               error_reporting( $error_reporting );
+                       }
                } else {
                        $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
                }
@@ -1180,8 +1188,14 @@ class wpdb {
        function query( $query ) {
                if ( ! $this->ready )
                        return false;
-
-               // some queries are made before the plugins have been loaded, and thus cannot be filtered with this method
+               /**
+                * Filter the database query.
+                *
+                * Some queries are made before the plugins have been loaded, and thus cannot be filtered with this method.
+                *
+                * @since 2.1.0
+                * @param string $query Database query.
+                */
                $query = apply_filters( 'query', $query );
 
                $return_val = 0;