summaryrefslogtreecommitdiffstats
path: root/wp-admin/includes/mu.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-admin/includes/mu.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-admin/includes/mu.php')
-rw-r--r--wp-admin/includes/mu.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index 90d0343..78004a8 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -25,7 +25,7 @@ function check_upload_size( $file ) {
add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
function wpmu_delete_blog($blog_id, $drop = false) {
- global $wpdb, $wpmuBaseTablePrefix;
+ global $wpdb;
if ( $blog_id != $wpdb->blogid ) {
$switch = true;
@@ -44,17 +44,17 @@ function wpmu_delete_blog($blog_id, $drop = false) {
update_blog_status( $blog_id, 'deleted', 1 );
if ( $drop ) {
- $drop_tables = array( $wpmuBaseTablePrefix . $blog_id . "_categories",
- $wpmuBaseTablePrefix . $blog_id . "_comments",
- $wpmuBaseTablePrefix . $blog_id . "_linkcategories",
- $wpmuBaseTablePrefix . $blog_id . "_links",
- $wpmuBaseTablePrefix . $blog_id . "_link2cat",
- $wpmuBaseTablePrefix . $blog_id . "_options",
- $wpmuBaseTablePrefix . $blog_id . "_post2cat",
- $wpmuBaseTablePrefix . $blog_id . "_postmeta",
- $wpmuBaseTablePrefix . $blog_id . "_posts",
- $wpmuBaseTablePrefix . $blog_id . "_referer_visitLog",
- $wpmuBaseTablePrefix . $blog_id . "_referer_blacklist" );
+ $drop_tables = array( $wpdb->base_prefix . $blog_id . "_categories",
+ $wpdb->base_prefix . $blog_id . "_comments",
+ $wpdb->base_prefix . $blog_id . "_linkcategories",
+ $wpdb->base_prefix . $blog_id . "_links",
+ $wpdb->base_prefix . $blog_id . "_link2cat",
+ $wpdb->base_prefix . $blog_id . "_options",
+ $wpdb->base_prefix . $blog_id . "_post2cat",
+ $wpdb->base_prefix . $blog_id . "_postmeta",
+ $wpdb->base_prefix . $blog_id . "_posts",
+ $wpdb->base_prefix . $blog_id . "_referer_visitLog",
+ $wpdb->base_prefix . $blog_id . "_referer_blacklist" );
reset( $drop_tables );
foreach ( (array) $drop_tables as $drop_table) {