Changeset 1134

Show
Ignore:
Timestamp:
10/26/07 16:50:19 (10 months ago)
Author:
donncha
Message:

Don't use $wpmuBaseTablePrefix any more, use $wpdb->base_prefix, props lunabyte, fixes #479

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/includes/mu.php

    r1133 r1134  
    2626 
    2727function wpmu_delete_blog($blog_id, $drop = false) { 
    28         global $wpdb, $wpmuBaseTablePrefix; 
     28        global $wpdb; 
    2929 
    3030        if ( $blog_id != $wpdb->blogid ) { 
    …… 
    4545 
    4646        if ( $drop ) { 
    47                 $drop_tables = array( $wpmuBaseTablePrefix . $blog_id . "_categories", 
    48                 $wpmuBaseTablePrefix . $blog_id . "_comments", 
    49                 $wpmuBaseTablePrefix . $blog_id . "_linkcategories", 
    50                 $wpmuBaseTablePrefix . $blog_id . "_links", 
    51                 $wpmuBaseTablePrefix . $blog_id . "_link2cat", 
    52                 $wpmuBaseTablePrefix . $blog_id . "_options", 
    53                 $wpmuBaseTablePrefix . $blog_id . "_post2cat", 
    54                 $wpmuBaseTablePrefix . $blog_id . "_postmeta", 
    55                 $wpmuBaseTablePrefix . $blog_id . "_posts", 
    56                 $wpmuBaseTablePrefix . $blog_id . "_referer_visitLog", 
    57                 $wpmuBaseTablePrefix . $blog_id . "_referer_blacklist" ); 
     47                $drop_tables = array( $wpdb->base_prefix . $blog_id . "_categories", 
     48                $wpdb->base_prefix . $blog_id . "_comments", 
     49                $wpdb->base_prefix . $blog_id . "_linkcategories", 
     50                $wpdb->base_prefix . $blog_id . "_links", 
     51                $wpdb->base_prefix . $blog_id . "_link2cat", 
     52                $wpdb->base_prefix . $blog_id . "_options", 
     53                $wpdb->base_prefix . $blog_id . "_post2cat", 
     54                $wpdb->base_prefix . $blog_id . "_postmeta", 
     55                $wpdb->base_prefix . $blog_id . "_posts", 
     56                $wpdb->base_prefix . $blog_id . "_referer_visitLog", 
     57                $wpdb->base_prefix . $blog_id . "_referer_blacklist" ); 
    5858                reset( $drop_tables ); 
    5959 

  • trunk/wp-admin/user-edit.php

    r1005 r1134  
    3737        wp_die(__('You do not have permission to edit this user.')); 
    3838 
    39 $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:{}'" ); 
     39$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:{}'" ); 
    4040$errors = edit_user($user_id); 
    4141if( $cap == null ) 
    42         $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); 
     42        $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:{}'" ); 
    4343 
    4444if( !is_wp_error( $errors ) ) { 

  • trunk/wp-admin/wpmu-blogs.php

    r1122 r1134  
    6565        // Edit blog 
    6666        case "editblog": 
    67                 $options = $wpdb->get_results( "SELECT * FROM {$wpmuBaseTablePrefix}{$id}_options WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A ); 
     67                $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 ); 
    6868                $details = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$id}'", ARRAY_A ); 
    69                 $editblog_roles = get_blog_option( $id, "{$wpmuBaseTablePrefix}{$id}_user_roles" ); 
     69                $editblog_roles = get_blog_option( $id, "{$wpdb->base_prefix}{$id}_user_roles" ); 
    7070                ?> 
    7171                <div class="wrap"> 

  • trunk/wp-admin/wpmu-edit.php

    r1132 r1134  
    176176                        foreach ( (array) $newroles as $userid => $role ) { 
    177177                                $role_len = strlen( $role ); 
    178                                 $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid'  AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities'" ); 
     178                                $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid'  AND meta_key = '" . $wpdb->base_prefix . $id . "_capabilities'" ); 
    179179                                if( false == $existing_role ) { 
    180                                         $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;}')" ); 
     180                                        $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;}')" ); 
    181181                                } elseif( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" ) { 
    182                                         $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'" ); 
     182                                        $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'" ); 
    183183                                } 
    184184 
    …… 
    190190                        reset( $_POST['blogusers'] ); 
    191191                        foreach ( (array) $_POST['blogusers'] as $key => $val ) { 
    192                                 delete_usermeta( $key, $wpmuBaseTablePrefix.$id.'_capabilities' ); 
    193                                 delete_usermeta( $key, $wpmuBaseTablePrefix.$id.'_user_level' ); 
     192                                delete_usermeta( $key, $wpdb->base_prefix.$id.'_capabilities' ); 
     193                                delete_usermeta( $key, $wpdb->base_prefix.$id.'_user_level' ); 
    194194                                delete_usermeta( $key, 'primary_blog', $id ); // Delete primary blog if need. 
    195195                        } 
    …… 
    204204                                $_POST['role'] = $newroles[ $userid ]; 
    205205                                if( $pass != '' ) { 
    206                                         $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:{}'" ); 
     206                                        $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:{}'" ); 
    207207                                        $userdata = get_userdata($userid); 
    208208                                        $_POST['pass1'] = $_POST['pass2'] = $pass; 
    …… 
    211211                                        edit_user( $userid ); 
    212212                                        if( $cap == null ) 
    213                                                 $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); 
     213                                                $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" ); 
    214214                                } 
    215215                        } 
    …… 
    225225                                $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='wp_" . $id . "_capabilities'" ); 
    226226                                if( $user == false ) 
    227                                         $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;}')" ); 
     227                                        $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;}')" ); 
    228228                        } 
    229229                } 

  • trunk/wp-admin/wpmu-upgrade-site.php

    r1092 r1134  
    2626                        foreach( (array) $blogs as $details ) { 
    2727                                if( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) { 
    28                                         $siteurl = $wpdb->get_var("SELECT option_value from {$wpmuBaseTablePrefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'"); 
     28                                        $siteurl = $wpdb->get_var("SELECT option_value from {$wpdb->base_prefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'"); 
    2929                                        echo "<li>$siteurl</li>"; 
    3030                                        if( $http_fopen ) { 

  • trunk/wp-includes/pluggable.php

    r1125 r1134  
    6060if ( !function_exists('get_userdata') ) : 
    6161function get_userdata( $user_id ) { 
    62         global $wpdb, $cache_userdata, $wpmuBaseTablePrefix; 
     62        global $wpdb, $cache_userdata; 
    6363        $user_id = abs(intval($user_id)); 
    6464        if ( $user_id == 0 ) 
    …… 
    6666 
    6767        $user = wp_cache_get($user_id, 'users'); 
    68         $user_level = $wpmuBaseTablePrefix . $wpdb->blogid . '_user_level'; 
     68        $user_level = $wpdb->base_prefix . $wpdb->blogid . '_user_level'; 
    6969        if ( $user && is_site_admin( $user->user_login ) ) { 
    7070                $user->$user_level = 10; 

  • trunk/wp-includes/user.php

    r1125 r1134  
    5151// For setups that use the multi-blog feature. 
    5252function get_users_of_blog( $id = '' ) { 
    53         global $wpdb, $wpmuBaseTablePrefix; 
     53        global $wpdb; 
    5454        if ( empty($id) ) 
    5555                $id = (int) $wpdb->blogid; 
    56         $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" ); 
     56        $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" ); 
    5757        return $users; 
    5858} 

  • trunk/wp-includes/wpmu-functions.php

    r1133 r1134  
    257257 
    258258function get_blog_option( $blog_id, $setting, $default='na' ) { 
    259         global $wpdb, $wpmuBaseTablePrefix; 
     259        global $wpdb; 
    260260 
    261261        $key = $blog_id."-".$setting."-blog_option"; 
    262262        $value = wp_cache_get( $key, "site-options" ); 
    263263        if( $value == null ) { 
    264                 $row = $wpdb->get_row( "SELECT * FROM {$wpmuBaseTablePrefix}{$blog_id}_options WHERE option_name = '{$setting}'" ); 
     264                $row = $wpdb->get_row( "SELECT * FROM {$wpdb->base_prefix}{$blog_id}_options WHERE option_name = '{$setting}'" ); 
    265265                if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values 
    266266                        $value = $row->option_value; 
    …… 
    319319 
    320320function switch_to_blog( $new_blog ) { 
    321         global $tmpoldblogdetails, $wpdb, $wpmuBaseTablePrefix, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; 
     321        global $tmpoldblogdetails, $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; 
    322322 
    323323        if ( empty($new_blog) ) 
    …… 
    348348 
    349349        // fix the new prefix. 
    350         $table_prefix = $wpmuBaseTablePrefix . $new_blog . "_"; 
     350        $table_prefix = $wpdb->base_prefix . $new_blog . "_"; 
    351351        $wpdb->prefix                   = $table_prefix; 
    352352        $wpdb->blogid           = $new_blog; 
    …… 
    379379 
    380380function restore_current_blog() { 
    381         global $table_prefix, $tmpoldblogdetails, $wpdb, $wpmuBaseTablePrefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; 
     381        global $table_prefix, $tmpoldblogdetails, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user; 
    382382 
    383383        if ( !$switched ) 
    …… 
    423423 
    424424function get_blogs_of_user( $id, $all = false ) { 
    425         global $wpdb, $wpmuBaseTablePrefix; 
     425        global $wpdb; 
    426426 
    427427        $user = get_userdata( $id ); 
    …… 
    434434        foreach ( (array) $user as $key => $value ) { 
    435435                if ( strstr( $key, '_capabilities') && strstr( $key, 'wp_') ) { 
    436                         preg_match('/' . $wpmuBaseTablePrefix . '(\d+)_capabilities/', $key, $match); 
     436                        preg_match('/' . $wpdb->base_prefix . '(\d+)_capabilities/', $key, $match); 
    437437                        $blog = get_blog_details( $match[1] ); 
    438438                        if ( $blog && isset( $blog->domain ) && ( $all == true || $all == false && ( $blog->archived == 0 && $blog->spam == 0 && $blog->deleted == 0 ) ) ) { 
    …… 
    579579 
    580580function get_blog_list( $start = 0, $num = 10, $display = true ) { 
    581         global $wpdb, $wpmuBaseTablePrefix; 
     581        global $wpdb; 
    582582 
    583583        $blogs = get_site_option( "blog_list" ); 
    …… 
    597597                foreach ( (array) $blogs as $key => $details ) { 
    598598                        $blog_list[ $details['blog_id'] ] = $details; 
    599                         $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'" ); 
     599                        $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'" ); 
    600600                } 
    601601                unset( $blogs ); 
    …… 
    630630 
    631631function get_blog_post( $blog_id, $post_id ) { 
    632         global $wpdb, $wpmuBaseTablePrefix; 
     632        global $wpdb; 
    633633 
    634634        $key = $blog_id."-".$post_id."-blog_post"; 
    635635        $post = wp_cache_get( $key, "site-options" ); 
    636636        if( $post == false ) { 
    637                 $post = $wpdb->get_row( "SELECT * FROM {$wpmuBaseTablePrefix}{$blog_id}_posts WHERE ID = '{$post_id}'" ); 
     637                $post = $wpdb->get_row( "SELECT * FROM {$wpdb->base_prefix}{$blog_id}_posts WHERE ID = '{$post_id}'" ); 
    638638                wp_cache_add( $key, $post, "site-options", 120 ); 
    639639        } 
    …… 
    791791 
    792792function is_blog_user( $blog_id = 0 ) { 
    793         global $current_user, $wpdb, $wpmuBaseTablePrefix; 
     793        global $current_user, $wpdb; 
    794794 
    795795        if ( !$blog_id ) 
    796796                $blog_id = $wpdb->blogid; 
    797797 
    798         $cap_key = $wpmuBaseTablePrefix . $blog_id . '_capabilities'; 
     798        $cap_key = $wpdb->base_prefix . $blog_id . '_capabilities'; 
    799799 
    800800        if ( is_array($current_user->$cap_key) && in_array(1, $current_user->$cap_key) ) 
    …… 
    13201320 
    13211321function install_blog_defaults($blog_id, $user_id) { 
    1322         global $wpdb, $wp_rewrite, $current_site, $table_prefix, $wpmuBaseTablePrefix; 
     1322        global $wpdb, $wp_rewrite, $current_site, $table_prefix; 
    13231323 
    13241324        $wpdb->hide_errors(); 
    …… 
    13621362        // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id. 
    13631363        if ( $user_id != 1 ) 
    1364                 $wpdb->query( "DELETE FROM ".$wpdb->usermeta." WHERE  user_id = '".$user_id."' AND meta_key = '" . $wpmuBaseTablePrefix . "1_capabilities'" ); 
     1364                $wpdb->query( "DELETE FROM ".$wpdb->usermeta." WHERE  user_id = '".$user_id."' AND meta_key = '" . $wpdb->base_prefix . "1_capabilities'" ); 
    13651365 
    13661366        $wpdb->show_errors(); 
    …… 
    14631463 
    14641464function get_most_recent_post_of_user( $user_id ) { 
    1465         global $wpdb, $wpmuBaseTablePrefix; 
     1465        global $wpdb; 
    14661466 
    14671467        $user_id = (int) $user_id; 
    …… 
    14731473        // published by $user_id 
    14741474        foreach ( $user_blogs as $blog ) { 
    1475                 $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); 
     1475                $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); 
    14761476 
    14771477                // Make sure we found a post 

  • trunk/wp-settings.php

    r1125 r1134  
    130130require_wp_db(); 
    131131// $table_prefix is deprecated as of 2.1 
    132 $wpdb->prefix = $table_prefix; 
     132$wpdb->prefix = $wpdb->base_prefix = $table_prefix; 
    133133 
    134134if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') ) 

  • trunk/wpmu-settings.php

    r1001 r1134  
    33        return; 
    44 
     5// depreciated 
    56$wpmuBaseTablePrefix = $table_prefix; 
    67