diff options
-rw-r--r-- | wp-admin/includes/mu.php | 24 | ||||
-rw-r--r-- | wp-admin/user-edit.php | 4 | ||||
-rw-r--r-- | wp-admin/wpmu-blogs.php | 4 | ||||
-rw-r--r-- | wp-admin/wpmu-edit.php | 16 | ||||
-rw-r--r-- | wp-admin/wpmu-upgrade-site.php | 4 | ||||
-rw-r--r-- | wp-includes/pluggable.php | 4 | ||||
-rw-r--r-- | wp-includes/user.php | 4 | ||||
-rw-r--r-- | wp-includes/wpmu-functions.php | 34 | ||||
-rw-r--r-- | wp-settings.php | 2 | ||||
-rw-r--r-- | wpmu-settings.php | 1 |
10 files changed, 49 insertions, 48 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) { diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index e3c1a3a..ec5d3f6 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -36,10 +36,10 @@ check_admin_referer('update-user_' . $user_id); if ( !current_user_can('edit_user', $user_id) ) wp_die(__('You do not have permission to edit this user.')); -$cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); +$cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); $errors = edit_user($user_id); if( $cap == null ) - $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); + $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); if( !is_wp_error( $errors ) ) { $redirect = "user-edit.php?user_id=$user_id&updated=true"; diff --git a/wp-admin/wpmu-blogs.php b/wp-admin/wpmu-blogs.php index cdad29a..642e842 100644 --- a/wp-admin/wpmu-blogs.php +++ b/wp-admin/wpmu-blogs.php @@ -64,9 +64,9 @@ if ( $_GET['updated'] == 'true' ) { switch( $_GET['action'] ) { // Edit blog case "editblog": - $options = $wpdb->get_results( "SELECT * FROM {$wpmuBaseTablePrefix}{$id}_options WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A ); + $options = $wpdb->get_results( "SELECT * FROM {$wpdb->base_prefix}{$id}_options WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A ); $details = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$id}'", ARRAY_A ); - $editblog_roles = get_blog_option( $id, "{$wpmuBaseTablePrefix}{$id}_user_roles" ); + $editblog_roles = get_blog_option( $id, "{$wpdb->base_prefix}{$id}_user_roles" ); ?> <div class="wrap"> <h2><?php _e('Edit Blog'); ?></h2> diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php index ae9c73d..d8438b9 100644 --- a/wp-admin/wpmu-edit.php +++ b/wp-admin/wpmu-edit.php @@ -175,11 +175,11 @@ switch( $_GET['action'] ) { reset( $newroles ); foreach ( (array) $newroles as $userid => $role ) { $role_len = strlen( $role ); - $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid' AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities'" ); + $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid' AND meta_key = '" . $wpdb->base_prefix . $id . "_capabilities'" ); if( false == $existing_role ) { - $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpmuBaseTablePrefix . $id . "_capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" ); + $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpdb->base_prefix . $id . "_capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" ); } elseif( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" ) { - $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid' AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities'" ); + $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid' AND meta_key = '" . $wpdb->base_prefix . $id . "_capabilities'" ); } } @@ -189,8 +189,8 @@ switch( $_GET['action'] ) { if( is_array( $_POST['blogusers'] ) ) { reset( $_POST['blogusers'] ); foreach ( (array) $_POST['blogusers'] as $key => $val ) { - delete_usermeta( $key, $wpmuBaseTablePrefix.$id.'_capabilities' ); - delete_usermeta( $key, $wpmuBaseTablePrefix.$id.'_user_level' ); + delete_usermeta( $key, $wpdb->base_prefix.$id.'_capabilities' ); + delete_usermeta( $key, $wpdb->base_prefix.$id.'_user_level' ); delete_usermeta( $key, 'primary_blog', $id ); // Delete primary blog if need. } } @@ -203,14 +203,14 @@ switch( $_GET['action'] ) { unset( $_POST['role'] ); $_POST['role'] = $newroles[ $userid ]; if( $pass != '' ) { - $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); + $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); $userdata = get_userdata($userid); $_POST['pass1'] = $_POST['pass2'] = $pass; $_POST['email'] = $userdata->user_email; $_POST['rich_editing'] = $userdata->rich_editing; edit_user( $userid ); if( $cap == null ) - $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); + $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); } } unset( $_POST['role'] ); @@ -224,7 +224,7 @@ switch( $_GET['action'] ) { if( $userid ) { $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='wp_" . $id . "_capabilities'" ); if( $user == false ) - $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpmuBaseTablePrefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST['new_role'] ) . ":\"" . $_POST['new_role'] . "\";b:1;}')" ); + $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpdb->base_prefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST['new_role'] ) . ":\"" . $_POST['new_role'] . "\";b:1;}')" ); } } wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id ); diff --git a/wp-admin/wpmu-upgrade-site.php b/wp-admin/wpmu-upgrade-site.php index 114d76c..2d426b0 100644 --- a/wp-admin/wpmu-upgrade-site.php +++ b/wp-admin/wpmu-upgrade-site.php @@ -25,7 +25,7 @@ switch( $_GET['action'] ) { echo "<ul>"; foreach( (array) $blogs as $details ) { if( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) { - $siteurl = $wpdb->get_var("SELECT option_value from {$wpmuBaseTablePrefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'"); + $siteurl = $wpdb->get_var("SELECT option_value from {$wpdb->base_prefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'"); echo "<li>$siteurl</li>"; if( $http_fopen ) { $fp = fopen( $siteurl . "wp-admin/upgrade.php?step=1", "r" ); @@ -67,4 +67,4 @@ switch( $_GET['action'] ) { ?> </div> -<?php include('admin-footer.php'); ?>
\ No newline at end of file +<?php include('admin-footer.php'); ?> diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 5c92fe4..48ba4b2 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -59,13 +59,13 @@ endif; if ( !function_exists('get_userdata') ) : function get_userdata( $user_id ) { - global $wpdb, $cache_userdata, $wpmuBaseTablePrefix; + global $wpdb, $cache_userdata; $user_id = abs(intval($user_id)); if ( $user_id == 0 ) return false; $user = wp_cache_get($user_id, 'users'); - $user_level = $wpmuBaseTablePrefix . $wpdb->blogid . '_user_level'; + $user_level = $wpdb->base_prefix . $wpdb->blogid . '_user_level'; if ( $user && is_site_admin( $user->user_login ) ) { $user->$user_level = 10; $user->user_level = 10; diff --git a/wp-includes/user.php b/wp-includes/user.php index d7aa7bd..3f25ffc 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -50,10 +50,10 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false // Get users with capabilities for the current blog. // For setups that use the multi-blog feature. function get_users_of_blog( $id = '' ) { - global $wpdb, $wpmuBaseTablePrefix; + global $wpdb; if ( empty($id) ) $id = (int) $wpdb->blogid; - $users = $wpdb->get_results( "SELECT user_id, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE " . $wpdb->users . ".ID = " . $wpdb->usermeta . ".user_id AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities' ORDER BY {$wpdb->usermeta}.user_id" ); + $users = $wpdb->get_results( "SELECT user_id, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE " . $wpdb->users . ".ID = " . $wpdb->usermeta . ".user_id AND meta_key = '" . $wpdb->base_prefix . $id . "_capabilities' ORDER BY {$wpdb->usermeta}.user_id" ); return $users; } diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php index c7aeab6..1ed2b18 100644 --- a/wp-includes/wpmu-functions.php +++ b/wp-includes/wpmu-functions.php @@ -256,12 +256,12 @@ function get_blog_option( $id, $key, $default='na' ) { */ function get_blog_option( $blog_id, $setting, $default='na' ) { - global $wpdb, $wpmuBaseTablePrefix; + global $wpdb; $key = $blog_id."-".$setting."-blog_option"; $value = wp_cache_get( $key, "site-options" ); if( $value == null ) { - $row = $wpdb->get_row( "SELECT * FROM {$wpmuBaseTablePrefix}{$blog_id}_options WHERE option_name = '{$setting}'" ); + $row = $wpdb->get_row( "SELECT * FROM {$wpdb->base_prefix}{$blog_id}_options WHERE option_name = '{$setting}'" ); if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values $value = $row->option_value; if( $value == false ) { @@ -318,7 +318,7 @@ function update_blog_option( $id, $key, $value, $refresh = true ) { } function switch_to_blog( $new_blog ) { - global $tmpoldblogdetails, $wpdb, $wpmuBaseTablePrefix, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; + global $tmpoldblogdetails, $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; if ( empty($new_blog) ) $new_blog = $blog_id; @@ -347,7 +347,7 @@ function switch_to_blog( $new_blog ) { $tmpoldblogdetails['blog_id'] = $blog_id; // fix the new prefix. - $table_prefix = $wpmuBaseTablePrefix . $new_blog . "_"; + $table_prefix = $wpdb->base_prefix . $new_blog . "_"; $wpdb->prefix = $table_prefix; $wpdb->blogid = $new_blog; $wpdb->posts = $table_prefix . 'posts'; @@ -378,7 +378,7 @@ function switch_to_blog( $new_blog ) { } function restore_current_blog() { - global $table_prefix, $tmpoldblogdetails, $wpdb, $wpmuBaseTablePrefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; + global $table_prefix, $tmpoldblogdetails, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; if ( !$switched ) return; @@ -422,7 +422,7 @@ function restore_current_blog() { } function get_blogs_of_user( $id, $all = false ) { - global $wpdb, $wpmuBaseTablePrefix; + global $wpdb; $user = get_userdata( $id ); if ( !$user ) @@ -433,7 +433,7 @@ function get_blogs_of_user( $id, $all = false ) { $i = 0; foreach ( (array) $user as $key => $value ) { if ( strstr( $key, '_capabilities') && strstr( $key, 'wp_') ) { - preg_match('/' . $wpmuBaseTablePrefix . '(\d+)_capabilities/', $key, $match); + preg_match('/' . $wpdb->base_prefix . '(\d+)_capabilities/', $key, $match); $blog = get_blog_details( $match[1] ); if ( $blog && isset( $blog->domain ) && ( $all == true || $all == false && ( $blog->archived == 0 && $blog->spam == 0 && $blog->deleted == 0 ) ) ) { $blogs[$match[1]]->userblog_id = $match[1]; @@ -578,7 +578,7 @@ function get_most_active_blogs( $num = 10, $display = true ) { } function get_blog_list( $start = 0, $num = 10, $display = true ) { - global $wpdb, $wpmuBaseTablePrefix; + global $wpdb; $blogs = get_site_option( "blog_list" ); $update = false; @@ -596,7 +596,7 @@ function get_blog_list( $start = 0, $num = 10, $display = true ) { foreach ( (array) $blogs as $key => $details ) { $blog_list[ $details['blog_id'] ] = $details; - $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT count(*) FROM " . $wpmuBaseTablePrefix . $details['blog_id'] . "_posts WHERE post_status='publish' AND post_type='post'" ); + $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT count(*) FROM " . $wpdb->base_prefix . $details['blog_id'] . "_posts WHERE post_status='publish' AND post_type='post'" ); } unset( $blogs ); $blogs = $blog_list; @@ -629,12 +629,12 @@ function get_blog_count( $id = 0 ) { } function get_blog_post( $blog_id, $post_id ) { - global $wpdb, $wpmuBaseTablePrefix; + global $wpdb; $key = $blog_id."-".$post_id."-blog_post"; $post = wp_cache_get( $key, "site-options" ); if( $post == false ) { - $post = $wpdb->get_row( "SELECT * FROM {$wpmuBaseTablePrefix}{$blog_id}_posts WHERE ID = '{$post_id}'" ); + $post = $wpdb->get_row( "SELECT * FROM {$wpdb->base_prefix}{$blog_id}_posts WHERE ID = '{$post_id}'" ); wp_cache_add( $key, $post, "site-options", 120 ); } @@ -790,12 +790,12 @@ function wpmu_admin_redirect_url() { } function is_blog_user( $blog_id = 0 ) { - global $current_user, $wpdb, $wpmuBaseTablePrefix; + global $current_user, $wpdb; if ( !$blog_id ) $blog_id = $wpdb->blogid; - $cap_key = $wpmuBaseTablePrefix . $blog_id . '_capabilities'; + $cap_key = $wpdb->base_prefix . $blog_id . '_capabilities'; if ( is_array($current_user->$cap_key) && in_array(1, $current_user->$cap_key) ) return true; @@ -1319,7 +1319,7 @@ function install_blog($blog_id, $blog_title = '') { } function install_blog_defaults($blog_id, $user_id) { - global $wpdb, $wp_rewrite, $current_site, $table_prefix, $wpmuBaseTablePrefix; + global $wpdb, $wp_rewrite, $current_site, $table_prefix; $wpdb->hide_errors(); @@ -1361,7 +1361,7 @@ function install_blog_defaults($blog_id, $user_id) { $wpdb->query( "DELETE FROM ".$wpdb->usermeta." WHERE user_id != '".$user_id."' AND meta_key = '".$table_prefix."capabilities'" ); // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id. if ( $user_id != 1 ) - $wpdb->query( "DELETE FROM ".$wpdb->usermeta." WHERE user_id = '".$user_id."' AND meta_key = '" . $wpmuBaseTablePrefix . "1_capabilities'" ); + $wpdb->query( "DELETE FROM ".$wpdb->usermeta." WHERE user_id = '".$user_id."' AND meta_key = '" . $wpdb->base_prefix . "1_capabilities'" ); $wpdb->show_errors(); } @@ -1462,7 +1462,7 @@ function get_user_id_from_string( $string ) { } function get_most_recent_post_of_user( $user_id ) { - global $wpdb, $wpmuBaseTablePrefix; + global $wpdb; $user_id = (int) $user_id; @@ -1472,7 +1472,7 @@ function get_most_recent_post_of_user( $user_id ) { // Walk through each blog and get the most recent post // published by $user_id foreach ( $user_blogs as $blog ) { - $recent_post = $wpdb->get_row("SELECT ID, post_date_gmt FROM {$wpmuBaseTablePrefix}{$blog->userblog_id}_posts WHERE post_author = '{$user_id}' AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", ARRAY_A); + $recent_post = $wpdb->get_row("SELECT ID, post_date_gmt FROM {$wpdb->base_prefix}{$blog->userblog_id}_posts WHERE post_author = '{$user_id}' AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", ARRAY_A); // Make sure we found a post if ( isset($recent_post['ID']) ) { 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."); diff --git a/wpmu-settings.php b/wpmu-settings.php index 5a2b3be..d96bbc6 100644 --- a/wpmu-settings.php +++ b/wpmu-settings.php @@ -2,6 +2,7 @@ if( $current_site && $current_blog )
return;
+// depreciated
$wpmuBaseTablePrefix = $table_prefix;
$domain = addslashes( $_SERVER['HTTP_HOST'] );
|