From b1aee5c2dbdaf4bcaccde5982f9d9954927b1a2e Mon Sep 17 00:00:00 2001 From: matt Date: Tue, 4 Jul 2006 18:28:08 +0000 Subject: [PATCH] Another step toward removing old table vars, this is why we should be careful about naming things! Fixes #2524 git-svn-id: http://svn.automattic.com/wordpress/trunk@3951 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index c21a3950c3..1716c5e405 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -91,18 +91,8 @@ if ( defined('CUSTOM_USER_TABLE') ) if ( defined('CUSTOM_USER_META_TABLE') ) $wpdb->usermeta = CUSTOM_USER_META_TABLE; -// We're going to need to keep this around for a few months even though we're not using it internally - -$tableposts = $wpdb->posts; -$tableusers = $wpdb->users; -$tablecategories = $wpdb->categories; -$tablepost2cat = $wpdb->post2cat; -$tablecomments = $wpdb->comments; -$tablelink2cat = $wpdb->link2cat; -$tablelinks = $wpdb->links; -$tablelinkcategories = $wpdb->linkcategories; -$tableoptions = $wpdb->options; -$tablepostmeta = $wpdb->postmeta; +// 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 (ABSPATH . 'wp-content/object-cache.php');