Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 22:32:52 +02:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
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.

Built from https://develop.svn.wordpress.org/trunk@26252


git-svn-id: http://core.svn.wordpress.org/trunk@26158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2013-11-18 20:45:11 +00:00
parent 0df020b516
commit da05f7435b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/upgrade.php
View File

@ -1553,9 +1553,9 @@ function dbDelta( $queries = '', $execute = true ) {
continue; continue;
// Fetch the table column structure from the database // Fetch the table column structure from the database
$wpdb->suppress_errors(); $suppress = $wpdb->suppress_errors();
$tablefields = $wpdb->get_results("DESCRIBE {$table};"); $tablefields = $wpdb->get_results("DESCRIBE {$table};");
$wpdb->suppress_errors( false ); $wpdb->suppress_errors( $suppress );
if ( ! $tablefields ) if ( ! $tablefields )
continue; continue;

8
wp-includes/ms-functions.php
View File

@ -1129,10 +1129,10 @@ function install_blog( $blog_id, $blog_title = '' ) {
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
$wpdb->suppress_errors(); $suppress = $wpdb->suppress_errors();
if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' ); die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
$wpdb->suppress_errors( false ); $wpdb->suppress_errors( $suppress );
$url = get_blogaddress_by_id( $blog_id ); $url = get_blogaddress_by_id( $blog_id );
@ -1179,11 +1179,11 @@ function install_blog_defaults($blog_id, $user_id) {
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
$wpdb->suppress_errors(); $suppress = $wpdb->suppress_errors();
wp_install_defaults($user_id); wp_install_defaults($user_id);
$wpdb->suppress_errors( false ); $wpdb->suppress_errors( $suppress );
} }
/** /**