Make WordPress Core

Ticket #16762: clipboard.patch

File clipboard.patch, 4.6 KB (added by hakre, 14 years ago)

I'm a bit unsure for the first change in user.php, the second and the other two files look good to me.

  • wp-includes/wp-db.php

    ### Eclipse Workspace Patch 1.0
    #P wordpress-trunk bare
     
    165165        var $prefix = '';
    166166
    167167        /**
     168         * {@internal Missing Description}}
     169         *
     170         * @since 3.0.0
     171         * @access private
     172         * @var string
     173         */
     174        var $base_prefix = '';
     175
     176        /**
    168177         * Whether the database queries are ready to start executing.
    169178         *
    170179         * @since 2.5.0
  • wp-includes/ms-functions.php

     
    14571457        // Walk through each blog and get the most recent post
    14581458        // published by $user_id
    14591459        foreach ( (array) $user_blogs as $blog ) {
    1460                 $recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$wpdb->base_prefix}{$blog->userblog_id}_posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
     1460                $prefix = $wpdb->get_blog_prefix( $blog->userblog_id );
     1461                $recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
    14611462
    14621463                // Make sure we found a post
    14631464                if ( isset($recent_post['ID']) ) {
     
    19521953        if ( $user_id == 0 )
    19531954                $user_id = $current_user->ID;
    19541955        if ( $blog_id == 0 )
    1955                 $blog_id = $wpdb->blogid;
     1956                $blog_id = null;
    19561957
    1957         $local_key = $wpdb->base_prefix . $blog_id . '_' . $key;
     1958        $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
    19581959
    19591960        if ( isset( $current_user->$local_key ) )
    19601961                return true;
  • wp-includes/user.php

     
    682682                        return false;
    683683
    684684                $blogs = $match = array();
    685                 $prefix_length = strlen($wpdb->base_prefix);
     685                $base_prefix = $wpdb->get_blog_prefix( 0 );
     686                $prefix_length = strlen($base_prefix);
    686687                foreach ( (array) $user as $key => $value ) {
    687                         if ( $prefix_length && substr($key, 0, $prefix_length) != $wpdb->base_prefix )
     688                        if ( $prefix_length && substr($key, 0, $prefix_length) != $base_prefix )
    688689                                continue;
    689690                        if ( substr($key, -12, 12) != 'capabilities' )
    690691                                continue;
    691                         if ( preg_match( '/^' . $wpdb->base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
     692                        if ( preg_match( '/^' . $base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
    692693                                if ( count( $match ) > 2 )
    693694                                        $blogs[] = (int) $match[ 2 ];
    694695                                else
     
    727728
    728729        $current_user = wp_get_current_user();
    729730        if ( !$blog_id )
    730                 $blog_id = $wpdb->blogid;
     731                $blog_id = null;
    731732
    732         $cap_key = $wpdb->base_prefix . $blog_id . '_capabilities';
     733        $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
    733734
    734735        if ( is_array($current_user->$cap_key) && in_array(1, $current_user->$cap_key) )
    735736                return true;
  • wp-admin/includes/upgrade.php

     
    297297
    298298                // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
    299299                if ( !is_super_admin( $user_id ) && $user_id != 1 )
    300                         $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $wpdb->base_prefix.'1_capabilities') );
     300                        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $wpdb->get_blog_prefix( 1 ).'capabilities') );
    301301        }
    302302}
    303303endif;
     
    11391139
    11401140        // 3.0 screen options key name changes.
    11411141        if ( is_main_site() && !defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
    1142                 $prefix = like_escape($wpdb->base_prefix);
     1142                $prefix = like_escape( $wpdb->get_blog_prefix( 0 ) );
    11431143                $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
    11441144                                         OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" );
    11451145        }