WordPress.org

Make WordPress Core

Changeset 15843


Ignore:
Timestamp:
10/19/2010 07:48:22 AM (9 years ago)
Author:
nacin
Message:

Pinking shears.

Location:
trunk
Files:
34 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin.php

    r15746 r15843  
    216216} else {
    217217    do_action("load-$pagenow");
    218     // Backwards compatibility with old load-page-new.php, load-page.php,  
    219     // and load-categories.php actions. 
    220     if ( $typenow == 'page' ) { 
    221         if ( $pagenow == 'post-new.php' ) 
    222             do_action( 'load-page-new.php' ); 
    223         elseif ( $pagenow == 'post.php' ) 
    224             do_action( 'load-page.php' ); 
     218    // Backwards compatibility with old load-page-new.php, load-page.php,
     219    // and load-categories.php actions.
     220    if ( $typenow == 'page' ) {
     221        if ( $pagenow == 'post-new.php' )
     222            do_action( 'load-page-new.php' );
     223        elseif ( $pagenow == 'post.php' )
     224            do_action( 'load-page.php' );
    225225    }  elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) {
    226226        do_action( 'load-categories.php' );
  • trunk/wp-admin/css/nav-menu.dev.css

    r15588 r15843  
    9696        font-weight:bold;
    9797    }
    98    
     98
    9999#nav-menu-footer {
    100100    border-width: 0 1px 1px 1px;
  • trunk/wp-admin/custom-header.php

    r15830 r15843  
    559559</table>
    560560    <?php endif;
    561    
    562 do_action( 'custom_header_options' ); 
     561
     562do_action( 'custom_header_options' );
    563563
    564564wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
     
    645645    <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
    646646    <?php wp_nonce_field( 'custom-header-crop-image' ) ?>
    647    
     647
    648648    <?php submit_button( __( 'Crop and Publish' ) ); ?>
    649649    </p>
  • trunk/wp-admin/includes/bookmark.php

    r15564 r15843  
    121121
    122122/**
    123  * This function inserts/updates links into/in the database. 
     123 * This function inserts/updates links into/in the database.
    124124 *
    125125 * @since 2.0.0
     
    222222 *
    223223 * @param int $link_id ID of link to update
    224  * @param array $link_categories Array of categories to 
     224 * @param array $link_categories Array of categories to
    225225 */
    226226function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
  • trunk/wp-admin/includes/default-list-tables.php

    r15842 r15843  
    8686
    8787        $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
    88         $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 
     88        $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
    8989
    9090        if ( $this->hierarchical_display )
     
    162162            $status_links[$status_name] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
    163163        }
    164        
     164   
    165165        return $status_links;
    166166    }
     
    736736
    737737            if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
    738                 $users_opt = array( 
    739                     'name' => 'post_author', 
    740                     'class'=> 'authors', 
    741                     'multi' => 1, 
    742                     'echo' => 0 
     738                $users_opt = array(
     739                    'name' => 'post_author',
     740                    'class'=> 'authors',
     741                    'multi' => 1,
     742                    'echo' => 0
    743743                );
    744744                if ( $bulk )
     
    999999        if ( !current_user_can('upload_files') )
    10001000            wp_die( __( 'You do not have permission to upload files.' ) );
    1001     }      
     1001    }   
    10021002
    10031003    function prepare_items() {
     
    14891489
    14901490        $this->callback_args = $args;
    1491        
     1491   
    14921492        $this->set_pagination_args( array(
    14931493            'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
    1494             'per_page' => $tags_per_page,      
     1494            'per_page' => $tags_per_page,   
    14951495        ) );
    14961496    }
     
    16781678        return $out;
    16791679    }
    1680    
     1680
    16811681    function column_description( $tag ) {
    16821682        return $tag->description;
     
    17121712    function column_default( $tag, $column_name ) {
    17131713        global $taxonomy;
    1714    
     1714
    17151715        return apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
    17161716        $out .= "</td>";
     
    18211821
    18221822        $this->items = $wp_user_search->get_results();
    1823        
     1823   
    18241824        $this->set_pagination_args( array(
    18251825            'total_items' => $wp_user_search->get_total(),
    1826             'per_page' => $users_per_page,     
     1826            'per_page' => $users_per_page, 
    18271827        ) );
    18281828    }
     
    18891889<?php
    18901890    }
    1891    
     1891
    18921892    function current_action() {
    18931893        if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
     
    25642564
    25652565        $this->items = get_bookmarks( $args );
    2566     }      
     2566    }   
    25672567
    25682568    function no_items() {
     
    27252725    }
    27262726
    2727     function check_permissions() {     
     2727    function check_permissions() { 
    27282728        if ( ! current_user_can( 'manage_sites' ) )
    27292729            wp_die( __( 'You do not have permission to access this page.' ) );
     
    30153015        if ( !is_multisite() )
    30163016            wp_die( __( 'Multisite support is not enabled.' ) );
    3017    
     3017
    30183018        if ( ! current_user_can( 'manage_network_users' ) )
    30193019            wp_die( __( 'You do not have permission to access this page.' ) );
     
    30463046
    30473047        $this->items = $wp_user_search->get_results();
    3048        
     3048   
    30493049        $this->set_pagination_args( array(
    30503050            'total_items' => $wp_user_search->get_total(),
    3051             'per_page' => $users_per_page,     
     3051            'per_page' => $users_per_page, 
    30523052        ) );
    30533053    }
     
    33683368            uasort( $this->items, '_order_plugins_callback' );
    33693369        }
    3370        
     3370   
    33713371        $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
    33723372
     
    34173417    function get_views() {
    34183418        global $totals, $status;
    3419    
     3419
    34203420        $status_links = array();
    34213421        foreach ( $totals as $type => $count ) {
     
    34533453            }
    34543454
    3455             $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>", 
     3455            $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>",
    34563456                add_query_arg('plugin_status', $type, 'plugins.php'),
    34573457                ( $type == $status ) ? ' class="current"' : '',
     
    36413641    function check_permissions() {
    36423642        if ( ! current_user_can('install_plugins') )
    3643             wp_die(__('You do not have sufficient permissions to install plugins on this site.'));     
     3643            wp_die(__('You do not have sufficient permissions to install plugins on this site.')); 
    36443644    }
    36453645
     
    40824082        include( ABSPATH . 'wp-admin/includes/theme-install.php' );
    40834083
    4084         global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;       
    4085        
     4084        global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;   
     4085   
    40864086        wp_reset_vars( array( 'tab' ) );
    40874087
  • trunk/wp-admin/includes/list-table.php

    r15764 r15843  
    262262        if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
    263263            return $_REQUEST['action2'];
    264        
     264   
    265265        return false;
    266266    }
     
    399399    function get_pagenum( $query_var = 'paged' ) {
    400400        $pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
    401    
     401
    402402        return max( 1, $pagenum );
    403403    }
     
    410410     *
    411411     * @return int
    412      */ 
     412     */
    413413    function get_items_per_page( $option, $default = 20 ) {
    414414        $per_page = (int) get_user_option( $option );
     
    622622     *
    623623     * @return array
    624      */ 
     624     */
    625625    function get_table_classes() {
    626626        extract( $this->_args );
  • trunk/wp-admin/includes/meta-boxes.php

    r15742 r15843  
    509509<label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
    510510<?php
    511     wp_dropdown_users( array( 
    512         'name' => 'post_author_override', 
     511    wp_dropdown_users( array(
     512        'name' => 'post_author_override',
    513513        'selected' => empty($post->ID) ? $user_ID : $post->post_author
    514514    ) );
  • trunk/wp-admin/includes/template.php

    r15830 r15843  
    20732073    $current_screen->is_network = is_network_admin() ? true : false;
    20742074    $current_screen->is_user = is_user_admin() ? true : false;
    2075    
     2075
    20762076    if ( $current_screen->is_network ) {
    20772077        $current_screen->base .= '-network';
  • trunk/wp-admin/js/list-table.dev.js

    r15530 r15843  
    7878
    7979        this.fetch_list(
    80             data, 
     80            data,
    8181            $.proxy(this, 'handle_success'),
    8282            $.proxy(this, 'handle_error')
  • trunk/wp-admin/js/nav-menu.dev.js

    r15709 r15843  
    919919                    if ( newID != matched[1] ) {
    920920                        $item.html( $item.html().replace(new RegExp(
    921                             'menu-item\\[' + matched[1] + '\\]', 'g'), 
     921                            'menu-item\\[' + matched[1] + '\\]', 'g'),
    922922                            'menu-item[' + newID + ']'
    923923                        ) );
  • trunk/wp-admin/js/theme.dev.js

    r15656 r15843  
    4848                opts.search = $( 'input[name=s]' ).val();
    4949                opts.order  = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random';
    50                
     50           
    5151                $( '#availablethemes td' ).fadeTo( 500, 0.1, function() {
    5252                    $( '#availablethemes td img' ).hide();
     
    5656            });
    5757        }
    58        
     58   
    5959        // These are the functions we expose
    6060        var api = {
     
    6969    theme_viewer = new ThemeViewer();
    7070    theme_viewer.init();
    71 }); 
     71});
  • trunk/wp-admin/network/edit.php

    r15836 r15843  
    7575        }
    7676    }
    77    
     77
    7878    submit_button( __('Confirm Deletion'), 'delete' );
    7979    ?>
  • trunk/wp-admin/options-general.php

    r15810 r15843  
    5050                    action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
    5151                    date : format.val(),
    52                 }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );   
     52                }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
    5353        });
    5454    });
  • trunk/wp-admin/themes.php

    r15809 r15843  
    111111    }
    112112    echo implode ( ' | ', $options );
    113    
     113
    114114    if ( $ct->tags ) : ?>
    115115    <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
     
    147147    <?php foreach ( $feature_list as $feature_name => $features ) :
    148148            $feature_name = esc_html( $feature_name ); ?>
    149        
     149   
    150150        <div class="feature-container">
    151151            <div class="feature-name"><?php echo $feature_name ?></div>
  • trunk/wp-includes/canonical.php

    r15765 r15843  
    343343    if ( !$redirect_url || $redirect_url == $requested_url )
    344344        return false;
    345        
    346     // Hex encoded octets are case-insensitive. 
     345   
     346    // Hex encoded octets are case-insensitive.
    347347    if ( false !== strpos($requested_url, '%') ) {
    348348        if ( !function_exists('lowercase_octets') ) {
    349             function lowercase_octets($matches) { 
    350                 return strtolower( $matches[0] ); 
    351             } 
     349            function lowercase_octets($matches) {
     350                return strtolower( $matches[0] );
     351            }
    352352        }
    353353        $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
  • trunk/wp-includes/category-template.php

    r15825 r15843  
    964964/**
    965965 * Check if the current post has any of given terms.
    966  * 
     966 *
    967967 * The given terms are checked against the post's terms' term_ids, names and slugs.
    968968 * Terms given as integers will only be checked against the post's terms' term_ids.
  • trunk/wp-includes/comment.php

    r15723 r15843  
    312312        wp_cache_add( $cache_key, $comments, 'comment' );
    313313
    314         return $comments;   
     314        return $comments;
    315315    }
    316316}
  • trunk/wp-includes/functions.php

    r15842 r15843  
    43434343 *
    43444344 * @since 3.1.0
    4345  * @access private 
     4345 * @access private
    43464346 *
    43474347 * @param callback $callback function that accepts ( ID, callback_arg, ... ) and outputs parent_ID
  • trunk/wp-includes/general-template.php

    r15819 r15843  
    655655        return;
    656656
    657    
     657
    658658    $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
    659659    $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
     
    664664        return $title;
    665665}
    666    
     666
    667667/**
    668668 * Display or retrieve page title for category archive.
  • trunk/wp-includes/link-template.php

    r15842 r15843  
    859859 *
    860860 * @param string $post_type Post type
    861  * @param string $feed Optional. Feed type 
    862  * @return string
    863  */ 
     861 * @param string $feed Optional. Feed type
     862 * @return string
     863 */
    864864function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
    865865    $default_feed = get_default_feed();
  • trunk/wp-includes/ms-blogs.php

    r15836 r15843  
    117117 *
    118118 * @since MU
    119  * 
     119 *
    120120 * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
    121121 * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
     
    489489        $wpdb->suppress_errors( false );
    490490    }
    491  
     491
    492492    if ( did_action('init') ) {
    493         $current_user = wp_get_current_user(); 
     493        $current_user = wp_get_current_user();
    494494        if ( is_object( $current_user ) )
    495495            $current_user->for_blog( $blog_id );
     
    664664 *
    665665 * @since MU
    666  * 
     666 *
    667667 * @param $deprecated Not used
    668668 * @param int $start The offset
  • trunk/wp-includes/ms-functions.php

    r15746 r15843  
    125125 * @since MU 1.1
    126126 * @uses get_blogs_of_user()
    127  * 
     127 *
    128128 * @param int $user_id The unique ID of the user
    129129 * @param int $blog Optional. If no blog_id is provided, current site is used
     
    269269 * users are removed from a blog.
    270270 *
    271  * Accepts an optional $reassign parameter, if you want to 
     271 * Accepts an optional $reassign parameter, if you want to
    272272 * reassign the user's blog posts to another user upon removal.
    273273 *
  • trunk/wp-includes/nav-menu-template.php

    r15774 r15843  
    197197
    198198    unset($menu_items);
    199    
     199
    200200    $sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args );
    201201
     
    315315
    316316    foreach ( (array) $menu_items as $key => $menu_item ) {
    317        
     317   
    318318        $menu_items[$key]->current = false;
    319        
     319   
    320320        $classes = (array) $menu_item->classes;
    321321        $classes[] = 'menu-item';
     
    363363            $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
    364364            $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
    365            
     365       
    366366            if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
    367367                $classes[] = 'current-menu-item';
     
    384384                $active_object = $menu_item->object;
    385385            }
    386            
     386       
    387387            if ( untrailingslashit($item_url) == home_url() )
    388388                $classes[] = 'menu-item-home';
     
    404404        $menu_items[$key]->current_item_ancestor = false;
    405405        $menu_items[$key]->current_item_parent = false;
    406        
     406   
    407407        if (
    408408            isset( $parent_item->type ) &&
  • trunk/wp-includes/post.php

    r15842 r15843  
    497497 * @since 3.1.0
    498498 * @uses has_term()
    499  * 
     499 *
    500500 * @param string $format The format to check for
    501501 * @param object|id $post The post to check. If not supplied, defaults to the current post if used in the loop.
     
    38133813 * Checked for changed slugs for published post objects and save the old slug.
    38143814 *
    3815  * The function is used when a post object of any type is updated, 
     3815 * The function is used when a post object of any type is updated,
    38163816 * by comparing the current and previous post objects.
    38173817 *
  • trunk/wp-includes/query.php

    r15832 r15843  
    104104 *
    105105 * If the $post_types parameter is specified, this function will additionally
    106  * check if the query is for exactly one of the post types specified. If a plugin 
     106 * check if the query is for exactly one of the post types specified. If a plugin
    107107 * is causing multiple post types to appear in the query, specifying a post type
    108108 * will cause this check to return false.
     
    136136    return $wp_query->is_post_type_archive( $post_types );
    137137}
    138    
     138
    139139/**
    140140 * Is the query for an attachment page?
     
    26492649     *
    26502650     * If the $post_types parameter is specified, this function will additionally
    2651      * check if the query is for exactly one of the post types specified. If a plugin 
     2651     * check if the query is for exactly one of the post types specified. If a plugin
    26522652     * is causing multiple post types to appear in the query, specifying a post type
    26532653     * will cause this check to return false.
  • trunk/wp-includes/taxonomy.php

    r15842 r15843  
    504504                    $term = $term->term_id;
    505505                else
    506                     continue;                  
     506                    continue;               
    507507            }
    508508            $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
     
    14471447
    14481448    $defaults = array();
    1449    
     1449
    14501450    if ( 'category' == $taxonomy ) {
    14511451        $defaults['default'] = get_option( 'default_category' );
     
    14531453            return 0; // Don't delete the default category
    14541454    }
    1455    
     1455
    14561456    $args = wp_parse_args($args, $defaults);
    14571457    extract($args, EXTR_SKIP);
     
    26422642    }
    26432643    // Back Compat filters.
    2644     if ( 'post_tag' == $taxonomy ) 
     2644    if ( 'post_tag' == $taxonomy )
    26452645        $termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
    26462646    elseif ( 'category' == $taxonomy )
     
    28162816    return false;
    28172817}
    2818  
     2818
    28192819/**
    28202820 * Get an array of ancestor IDs for a given object.
     
    28262826function get_ancestors($object_id = 0, $object_type = '') {
    28272827    $object_id = (int) $object_id;
    2828  
     2828
    28292829    $ancestors = array();
    28302830
     
    28322832        return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
    28332833    }
    2834        
     2834   
    28352835    if ( is_taxonomy_hierarchical( $object_type ) ) {
    28362836        $term = get_term($object_id, $object_type);
     
    28412841    } elseif ( null !== get_post_type_object( $object_type ) ) {
    28422842        $object = get_post($object_id);
    2843         if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) ) 
     2843        if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
    28442844            $ancestors = $object->ancestors;
    28452845        else {
  • trunk/wp-includes/theme-compat/comments-popup.php

    r14771 r15843  
    44 * @subpackage Theme_Compat
    55 * @deprecated 3.0
    6  * 
     6 *
    77 * This file is here for Backwards compatibility with old themes and will be removed in a future version
    8  * 
     8 *
    99 */
    1010_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
  • trunk/wp-includes/theme-compat/comments.php

    r14983 r15843  
    44 * @subpackage Theme_Compat
    55 * @deprecated 3.0
    6  * 
     6 *
    77 * This file is here for Backwards compatibility with old themes and will be removed in a future version
    8  * 
     8 *
    99 */
    1010_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
     
    1313    if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
    1414        die ('Please do not load this page directly. Thanks!');
    15    
     15
    1616    if ( post_password_required() ) { ?>
    17         <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p> 
     17        <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
    1818    <?php
    1919        return;
     
    5959<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
    6060
    61 <div id="cancel-comment-reply"> 
     61<div id="cancel-comment-reply">
    6262    <small><?php cancel_comment_reply_link() ?></small>
    63 </div> 
     63</div>
    6464
    6565<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
     
    9191
    9292<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
    93 <?php comment_id_fields(); ?> 
     93<?php comment_id_fields(); ?>
    9494</p>
    9595<?php do_action('comment_form', $post->ID); ?>
  • trunk/wp-includes/theme-compat/footer.php

    r14771 r15843  
    44 * @subpackage Theme_Compat
    55 * @deprecated 3.0
    6  * 
     6 *
    77 * This file is here for Backwards compatibility with old themes and will be removed in a future version
    8  * 
     8 *
    99 */
    1010_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
  • trunk/wp-includes/theme-compat/header.php

    r14366 r15843  
    44 * @subpackage Theme_Compat
    55 * @deprecated 3.0
    6  * 
     6 *
    77 * This file is here for Backwards compatibility with old themes and will be removed in a future version
    8  * 
     8 *
    99 */
    1010_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
  • trunk/wp-includes/theme-compat/sidebar.php

    r15229 r15843  
    44 * @subpackage Theme_Compat
    55 * @deprecated 3.0
    6  * 
     6 *
    77 * This file is here for Backwards compatibility with old themes and will be removed in a future version
    8  * 
     8 *
    99 */
    1010_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
  • trunk/wp-includes/user.php

    r15833 r15843  
    643643    $order_meta    = get_user_meta( $user_id, 'blog_order' );
    644644    $visible_meta  = get_user_meta( $user_id, 'blog_visibility' );
    645    
     645
    646646    $order = $order_meta;
    647647    if ( !is_array( $order ) )
     
    651651    if ( !is_array( $visible ) )
    652652        $visible = array();
    653    
     653
    654654    // Index the blogs by userblog_id and set the visibility flag
    655655    // Visibility is on by default, unless a linked site then off
     
    668668        if ( is_object( $id ) && isset( $id->userblog_id ) )
    669669            $id = $id->userblog_id;
    670            
     670       
    671671        if ( is_numeric( $id ) && isset( $newblogs[intval( $id )] ) ) {
    672672            $ordered[$id] = $newblogs[$id];
     
    725725function is_blog_user( $blog_id = 0 ) {
    726726    global $wpdb;
    727  
     727
    728728    $current_user = wp_get_current_user();
    729729    if ( !$blog_id )
  • trunk/wp-includes/wp-db.php

    r15808 r15843  
    541541    /**
    542542     * Sets the connection's character set.
    543      * 
     543     *
    544544     * @param resource $dbh     The resource given by mysql_connect
    545545     * @param string   $charset The character set (optional)
     
    741741     */
    742742    function select( $db, $dbh = null) {
    743         if ( is_null($dbh) ) 
     743        if ( is_null($dbh) )
    744744            $dbh = $this->dbh;
    745745
     
    10441044<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
    10451045"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
    1046            
     1046       
    10471047            //If show errors is disabled then we need to die anyway as we don't have a working DB connection
    10481048            die();
  • trunk/wp-login.php

    r15782 r15843  
    262262    if ( empty( $user ) )
    263263        return new WP_Error('invalid_key', __('Invalid key'));
    264        
     264   
    265265    return $user;
    266266}
Note: See TracChangeset for help on using the changeset viewer.