Changeset 13569

Timestamp:

03/03/2010 07:27:18 AM (15 years ago)

Author:

nacin

Message:

Ignore custom user tables when checking whether the blog is installed. see #12083

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1825 +1825 @@
     $wpdb->suppress_errors( $suppress );
 
-    $wp_tables = $wpdb->tables( 'all' );
+    $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
@@ -1832 +1832 @@
         // 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') )