Changeset 21924

Timestamp:

09/20/2012 01:39:46 PM (12 years ago)

Author:

ryan

Message:

Suppress db errors when checking if the blog is already installed in install_blog(). Use DESCRIBE instead of SELECT. Props bpetty. fixes #21922

File:

• trunk/wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -1128 +1128 @@
     require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-    if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") )
+    $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 );
 
     $url = get_blogaddress_by_id( $blog_id );