From 1503e05616c295e6f980134dc341fa1a66dc9672 Mon Sep 17 00:00:00 2001 From: donncha Date: Wed, 2 Jan 2008 16:00:05 +0000 Subject: Merge with WP 2.3.2 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1172 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-settings.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wp-settings.php') diff --git a/wp-settings.php b/wp-settings.php index bc35a34..292f5d4 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -130,6 +130,9 @@ if ( file_exists(ABSPATH . 'wp-content/db.php') ) else require_once (ABSPATH . WPINC . '/wp-db.php'); +if ( !empty($wpdb->error) ) + dead_db(); + // $table_prefix is deprecated as of 2.1 $wpdb->prefix = $wpdb->base_prefix = $table_prefix; @@ -137,6 +140,7 @@ if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-co wp_die("ERROR: $table_prefix in wp-config.php can only contain numbers, letters, and underscores."); // Table names +$wpdb->usermeta = $wpdb->prefix . 'usermeta'; $wpdb->blogs = $wpdb->prefix . 'blogs'; $wpdb->site = $wpdb->prefix . 'site'; $wpdb->sitemeta = $wpdb->prefix . 'sitemeta'; @@ -145,7 +149,6 @@ $wpdb->signups = $wpdb->prefix . 'signups'; $wpdb->registration_log = $wpdb->prefix . 'registration_log'; $wpdb->blog_versions = $wpdb->prefix . 'blog_versions'; $wpdb->users = $wpdb->prefix . 'users'; -$wpdb->usermeta = $wpdb->prefix . 'usermeta'; if( defined( 'SUNRISE' ) ) include_once( ABSPATH . 'wp-content/sunrise.php' ); @@ -172,9 +175,6 @@ if ( defined('CUSTOM_USER_TABLE') ) if ( defined('CUSTOM_USER_META_TABLE') ) $wpdb->usermeta = CUSTOM_USER_META_TABLE; -// To be removed in 2.2 -$tableposts = $tableusers = $tablecategories = $tablepost2cat = $tablecomments = $tablelink2cat = $tablelinks = $tablelinkcategories = $tableoptions = $tablepostmeta = ''; - if ( file_exists(ABSPATH . 'wp-content/object-cache.php') ) require_once (ABSPATH . 'wp-content/object-cache.php'); else -- cgit