summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-10-26 16:50:19 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-10-26 16:50:19 +0000
commitd1174c0013283b8dc16c5349eac995fe2a1039ad (patch)
tree9102d9a91f56ba2e92e729f09d6fb118856bb78d /wp-settings.php
parentb6993d5766a5630574951bf4e62c7e55ae92c090 (diff)
downloadwordpress-mu-d1174c0013283b8dc16c5349eac995fe2a1039ad.tar.gz
wordpress-mu-d1174c0013283b8dc16c5349eac995fe2a1039ad.tar.xz
wordpress-mu-d1174c0013283b8dc16c5349eac995fe2a1039ad.zip
Don't use $wpmuBaseTablePrefix any more, use $wpdb->base_prefix, props lunabyte, fixes #479
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1134 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-settings.php b/wp-settings.php
index f790af8..442fe50 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -129,7 +129,7 @@ require (ABSPATH . WPINC . '/functions.php');
require_wp_db();
// $table_prefix is deprecated as of 2.1
-$wpdb->prefix = $table_prefix;
+$wpdb->prefix = $wpdb->base_prefix = $table_prefix;
if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') )
wp_die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.");