Changeset 11902

Timestamp:

09/06/2009 06:46:27 PM (15 years ago)

Author:

ryan

Message:

is_blog_installed() improvements and repair.php. see #10728

Location:

trunk

Files:

• wp-admin/maint (added)
• wp-admin/maint/repair.php (added)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1772 +1772 @@
     wp_cache_set( 'is_blog_installed', $installed );
 
-    return $installed;
+    if ( $installed )
+        return true;
+
+    $suppress = $wpdb->suppress_errors();
+    $tables = $wpdb->get_col('SHOW TABLES');
+    $wpdb->suppress_errors( $suppress );
+
+    // 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.
+    foreach ($wpdb->tables as $table) {
+        // If one of the WP tables exist, then we are in an insane state.
+        if ( in_array($wpdb->prefix . $table, $tables) ) {
+            // If visiting repair.php, return true and let it take over.
+            if ( defined('WP_REPAIRING') )
+                return true;
+            // Die with a DB error.
+            $wpdb->error = __('One or more database tables are unavailable.  The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.');
+            dead_db();
+        }
+    }
+
+    wp_cache_set( 'is_blog_installed', false );
+
+    return false;
 }
 

trunk/wp-includes/wp-db.php

@@ -255 +255 @@
             'postmeta', 'terms', 'term_taxonomy', 'term_relationships');
 
+    /**
+     * List of deprecated WordPress tables
+     *
+     * @since 2.9.0
+     * @access private
+     * @var array
+     */
+    var $old_tables = array('categories', 'post2cat', 'link2cat');
+
+    
     /**
      * Format specifiers for DB columns. Columns not listed here default to %s.  Initialized in wp-settings.php.