Changeset 21511 for trunk/wp-includes/wp-db.php

Timestamp:

08/14/2012 08:21:10 PM (14 years ago)

Author:

nacin

Message:

Eliminate error suppression for mysql_free_result() and only call it when the result is actually a resource. Depending on the query, mysql_query() can return a boolean rather than a resource, hence the original use of error suppression.

Fixes a warning introduced in [21472] when calling mysql_free_result() was moved to flush().

fixes #20838.

File:

• trunk/wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-includes/wp-db.php

@@ -130 +130 @@
          */
         var $last_result;
+
+        /**
+         * MySQL result, which is either a resource or boolean.
+         *
+         * @since unknown
+         * @access protected
+         * @var mixed
+         */
+        protected $result;
 
         /**
@@ -1077 +1086 @@
                 $this->col_info    = null;
                 $this->last_query  = null;
-                @mysql_free_result( $this->result );
+
+                if ( is_resource( $this->result ) )
+                        mysql_free_result( $this->result );
         }