Changeset 26252 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

11/18/2013 08:44:34 PM (12 years ago)

Author:

wonderboymusic

Message:

For unit tests that call wpmu_create_blog(), Blog factory, or installation code that attempts to clear transients: suppress database errors on setUp and restore on tearDown.

There are a few places in core that were preventing this from working by explicity setting $wpdb->suppress_errors to false. Instead, they should inherit the value that existed before errors were suppressed.

This allows Multisite unit tests to run without explosive database errors, and allows $wpdb->suppress_errors to be overridden all the way down the chain.

Fixes #26102.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -1554 +1554 @@
 
         // Fetch the table column structure from the database
-        $wpdb->suppress_errors();
+        $suppress = $wpdb->suppress_errors();
         $tablefields = $wpdb->get_results("DESCRIBE {$table};");
-        $wpdb->suppress_errors( false );
+        $wpdb->suppress_errors( $suppress );
 
         if ( ! $tablefields )