Changeset 19039

Timestamp:

10/21/2011 10:16:33 PM (13 years ago)

Author:

ryan

Message:

Don't use unbounded SHOW TABLES in is_blog_installed(). Do a more targeted DESCRIBE loop over the blog table list. fixes #19026

File:

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

trunk/wp-includes/functions.php

@@ -1900 +1900 @@
         return true;
 
+    // If visiting repair.php, return true and let it take over.
+    if ( defined( 'WP_REPAIRING' ) )
+        return true;
+
     $suppress = $wpdb->suppress_errors();
-    $tables = $wpdb->get_col('SHOW TABLES');
-    $wpdb->suppress_errors( $suppress );
-
-    $wp_tables = $wpdb->tables();
+
     // Loop over the WP tables.  If none exist, then scratch install is allowed.
     // If one or more exist, suggest table repair since we got here because the options
     // table could not be accessed.
+    $wp_tables = $wpdb->tables();
     foreach ( $wp_tables as $table ) {
-        // If one of the WP tables exist, then we are in an insane state.
-        if ( in_array( $table, $tables ) ) {
-            // The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-            if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
-                continue;
-            if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-                continue;
-
-            // If visiting repair.php, return true and let it take over.
-            if ( defined('WP_REPAIRING') )
-                return true;
-            // Die with a DB error.
-            $wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable.  The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' );
-            dead_db();
-        }
-    }
+        // The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
+        if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
+            continue;
+        if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
+            continue;
+
+        if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
+            continue;
+
+        // One or more tables exist. We are insane.
+
+        // Die with a DB error.
+        $wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable.  The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' );
+        dead_db();
+    }
+
+    $wpdb->suppress_errors( $suppress );
 
     wp_cache_set( 'is_blog_installed', false );