Changeset 47343 for branches/3.7/src/wp-includes/ms-functions.php

Timestamp:

02/22/2020 12:05:12 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Fix the Travis CI build for the 3.7 branch.

Among other fixes, this backports [26087], [26091], [26095], [26252], [26307], [26318], [26512], [26705], [26871], [26909-26910], [26940], [27086], [27168], [28799], [28873], [28943], [28961], [28964], [28966-28967], [29120], [29251], [29503], [29860], [29869], [29954], [30001], [30282], [30285], [30289-30291], [30513-30514], [30516-30521], [30524], [30526], [30529-30530], [31253-31254], [31257-31259], [31622], [40241], [40255], [40257], [40259], [40269], [40271], [40446], [40449], [40457], [40604], [40538], [40833], [41082], [41303], [41306], [44993].

See #49485.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/ms-functions.php (modified) (2 diffs)

branches/3.7/src/wp-includes/ms-functions.php

@@ -1131 +1131 @@
     require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-    $wpdb->suppress_errors();
+    $suppress = $wpdb->suppress_errors();
     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>' );
-    $wpdb->suppress_errors( false );
+    $wpdb->suppress_errors( $suppress );
 
     $url = get_blogaddress_by_id( $blog_id );
@@ -1181 +1181 @@
     require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-    $wpdb->suppress_errors();
+    $suppress = $wpdb->suppress_errors();
 
     wp_install_defaults($user_id);
 
-    $wpdb->suppress_errors( false );
+    $wpdb->suppress_errors( $suppress );
 }