WordPress.org

Make WordPress Core

Changeset 13569


Ignore:
Timestamp:
03/03/10 07:27:18 (4 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r13526 r13569  
    18251825    $wpdb->suppress_errors( $suppress ); 
    18261826 
    1827     $wp_tables = $wpdb->tables( 'all' ); 
     1827    $wp_tables = $wpdb->tables(); 
    18281828    // Loop over the WP tables.  If none exist, then scratch install is allowed. 
    18291829    // If one or more exist, suggest table repair since we got here because the options 
     
    18321832        // If one of the WP tables exist, then we are in an insane state. 
    18331833        if ( in_array( $table, $tables ) ) { 
     1834            // The existence of custom user tables shouldn't suggest an insane state or prevent a clean install. 
     1835            if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) 
     1836                continue; 
     1837            if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) 
     1838                continue;                
     1839 
    18341840            // If visiting repair.php, return true and let it take over. 
    18351841            if ( defined('WP_REPAIRING') ) 
Note: See TracChangeset for help on using the changeset viewer.