WordPress.org

Make WordPress Core

Changeset 16438


Ignore:
Timestamp:
11/17/2010 06:47:34 PM (9 years ago)
Author:
ryan
Message:

Pinking shears

Location:
trunk
Files:
35 edited

Legend:

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

    r16388 r16438  
    724724    require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
    725725
    726     // For performance reasons, we omit some object properties from the checklist. 
     726    // For performance reasons, we omit some object properties from the checklist.
    727727    // The following is a hacky way to restore them when adding non-custom items.
    728728
     
    730730    foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
    731731        if (
    732             ! empty( $menu_item_data['menu-item-type'] ) && 
     732            ! empty( $menu_item_data['menu-item-type'] ) &&
    733733            'custom' != $menu_item_data['menu-item-type'] &&
    734734            ! empty( $menu_item_data['menu-item-object-id'] )
     
    740740
    741741                case 'taxonomy' :
    742                     $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] ); 
     742                    $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
    743743                break;
    744744            }
    745745
    746             $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) ); 
     746            $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
    747747            $_menu_item = array_shift( $_menu_items );
    748748
     
    750750            $menu_item_data['menu-item-description'] = $_menu_item->description;
    751751        }
    752        
     752
    753753        $menu_items_data[] = $menu_item_data;
    754     }   
     754    }
    755755
    756756    $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
     
    10781078
    10791079    wp_link_ajax( $_POST );
    1080    
     1080
    10811081    exit;
    10821082    break;
  • trunk/wp-admin/css/colors-classic.dev.css

    r16418 r16438  
    11271127.folded #adminmenu li.wp-has-current-submenu,
    11281128.folded #adminmenu li.menu-top.current {
    1129     background: #e0e0e0 url(../images/menu-bits-vs.gif?ver=20101102) top left repeat-x; 
    1130     border: #5589aa 1px solid; 
     1129    background: #e0e0e0 url(../images/menu-bits-vs.gif?ver=20101102) top left repeat-x;
     1130    border: #5589aa 1px solid;
    11311131    color: #464646;
    11321132}
  • trunk/wp-admin/edit-comments.php

    r16333 r16438  
    1111if ( !current_user_can('edit_posts') )
    1212    wp_die(__('Cheatin’ uh?'));
    13            
     13
    1414$wp_list_table = get_list_table('WP_Comments_List_Table');
    1515$wp_list_table->check_permissions();
  • trunk/wp-admin/edit-tags.php

    r16362 r16438  
    1212if ( !current_user_can( $tax->cap->manage_terms ) )
    1313    wp_die( __( 'Cheatin’ uh?' ) );
    14            
     14
    1515$wp_list_table = get_list_table('WP_Terms_List_Table');
    1616$wp_list_table->check_permissions();
  • trunk/wp-admin/includes/class-wp-media-list-table.php

    r16229 r16438  
    9999        if ( $this->detached ) {
    100100            submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
    101         } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) { 
     101        } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
    102102            submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
    103103        } ?>
  • trunk/wp-admin/includes/class-wp-ms-sites-list-table.php

    r16329 r16438  
    195195
    196196            $blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
    197            
     197
    198198            list( $columns, $hidden ) = $this->get_column_info();
    199199
  • trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

    r16361 r16438  
    88 */
    99class WP_MS_Themes_List_Table extends WP_List_Table {
    10    
     10
    1111    var $site_id;
    1212    var $is_site_themes;
     
    3535        ) );
    3636    }
    37    
     37
    3838    function check_permissions() {
    3939        if ( is_multisite() ) {
     
    4646        }
    4747
    48         if ( $this->is_site_themes && !current_user_can('manage_sites') ) 
    49             wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) ); 
    50         else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') ) 
     48        if ( $this->is_site_themes && !current_user_can('manage_sites') )
     49            wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
     50        else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') )
    5151            wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
    5252    }
     
    6565        );
    6666
    67         $site_allowed_themes = get_site_allowed_themes(); 
     67        $site_allowed_themes = get_site_allowed_themes();
    6868        if ( !$this->is_site_themes ) {
    6969            $allowed_themes = $site_allowed_themes;
     
    7373            $themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
    7474        }
    75        
     75
    7676        $current = get_site_transient( 'update_themes' );
    7777
     
    9090                $themes['upgrade'][$key] = $themes['all'][$key];
    9191
    92             if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) { 
    93                 unset( $themes['all'][$key] ); 
    94                 unset( $themes['enabled'][$key] ); 
    95                 unset( $themes['disabled'][$key] ); 
     92            if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) {
     93                unset( $themes['all'][$key] );
     94                unset( $themes['enabled'][$key] );
     95                unset( $themes['disabled'][$key] );
    9696            }
    9797        }
     
    132132        ) );
    133133    }
    134    
     134
    135135    function _search_callback( $theme ) {
    136136        static $term;
     
    212212            }
    213213
    214             if ( $this->is_site_themes ) 
    215                 $url = 'site-themes.php?id=' . $this->site_id; 
    216             else 
     214            if ( $this->is_site_themes )
     215                $url = 'site-themes.php?id=' . $this->site_id;
     216            else
    217217                $url = 'themes.php';
    218218
     
    237237        if ( current_user_can( 'update_themes' ) )
    238238            $actions['update-selected'] = __( 'Update' );
    239            
     239
    240240        return $actions;
    241241    }
     
    333333
    334334                    echo "</div></td>";
    335                     break; 
     335                    break;
    336336                    break;
    337337                default:
  • trunk/wp-admin/includes/class-wp-plugins-list-table.php

    r16372 r16438  
    258258
    259259        if ( 'active' != $status ) {
    260             $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
     260            $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected';
    261261            $actions[ $action ] = __( 'Activate' );
    262262        }
     
    433433                    if ( ! empty( $plugin_data['PluginURI'] ) )
    434434                        $plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
    435    
     435
    436436                    $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
    437437                    echo implode( ' | ', $plugin_meta );
  • trunk/wp-admin/includes/class-wp-posts-list-table.php

    r16376 r16438  
    667667            default:
    668668            ?>
    669             <td <?php echo $attributes ?>><?php 
     669            <td <?php echo $attributes ?>><?php
    670670                if ( 'page' == $post->post_type )
    671671                    do_action( 'manage_pages_custom_column', $column_name, $post->ID );
  • trunk/wp-admin/includes/dashboard.php

    r16431 r16438  
    150150        $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
    151151    }
    152    
     152
    153153    if ( is_blog_admin () )
    154154        $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
     
    422422    $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
    423423    $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
    424    
     424
    425425    $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
    426426
  • trunk/wp-admin/includes/file.php

    r16366 r16438  
    9797 * @since 1.5.0
    9898 *
    99  * @uses get_home_path 
     99 * @uses get_home_path
    100100 * @uses WP_CONTENT_DIR full filesystem path to the wp-content directory
    101101 * @param string $file filesystem path relative to the WordPress install directory or to the wp-content directory
     
    255255 * @uses wp_upload_dir
    256256 * @uses wp_unique_filename
    257  * @uses delete_transient   
     257 * @uses delete_transient
    258258 * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file.
    259259 * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
  • trunk/wp-admin/includes/list-table.php

    r16175 r16438  
    1818function get_list_table( $class ) {
    1919    $class = apply_filters( "get_list_table_$class", $class );
    20    
     20
    2121    require_list_table( $class );
    2222
  • trunk/wp-admin/includes/media.php

    r16431 r16438  
    11201120
    11211121    $post = get_post( $attachment_id );
    1122    
     1122
    11231123    $default_args = array( 'errors' => null, 'send' => $post->post_parent ? post_type_supports( get_post_type( $post->post_parent ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
    11241124    $args = wp_parse_args( $args, $default_args );
  • trunk/wp-admin/includes/meta-boxes.php

    r16431 r16438  
    156156$post_formats = get_theme_support( 'post-formats' );
    157157
    158 if ( is_array( $post_formats[0] ) ) : 
     158if ( is_array( $post_formats[0] ) ) :
    159159    $post_format = get_post_format( $post->ID );
    160160    if ( !$post_format )
  • trunk/wp-admin/includes/plugin.php

    r16313 r16438  
    486486 * @param string $plugin Plugin path to main plugin file with plugin data.
    487487 * @param string $redirect Optional. URL to redirect to.
    488  * @param bool $network_wide Whether to enable the plugin for all sites in the 
     488 * @param bool $network_wide Whether to enable the plugin for all sites in the
    489489 *   network or just the current site. Multisite only. Default is false.
    490490 * @param bool $silent Prevent calling activation hooks. Optional, default is false.
  • trunk/wp-admin/includes/template.php

    r16431 r16438  
    21202120    endswitch;
    21212121    $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
    2122    
     2122
    21232123    $attributes = '';
    21242124    if ( is_array( $other_attributes ) ) {
     
    21292129        $attributes = $other_attributes;
    21302130    }
    2131    
     2131
    21322132    // Default the id attribute to $name unless an id was specifically provided in $other_attributes
    21332133    $id = $name;
    21342134    if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) )
    21352135        $id = $other_attributes['id'];
    2136    
     2136
    21372137    $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class );
    21382138    $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
    2139    
     2139
    21402140    if ( $wrap ) {
    21412141        $button = '<p class="submit">' . $button . '</p>';
    21422142    }
    2143    
     2143
    21442144    return $button;
    21452145}
  • trunk/wp-admin/js/list-table.dev.js

    r16433 r16438  
    7070                data[key] = '';
    7171            else
    72                 data[key] = value;     
     72                data[key] = value;
    7373        });
    7474
  • trunk/wp-admin/media.php

    r16326 r16438  
    6767    wp_enqueue_script('image-edit');
    6868    wp_enqueue_style('imgareaselect');
    69    
     69
    7070    add_contextual_help( $current_screen,
    7171    '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
  • trunk/wp-admin/widgets.php

    r16326 r16438  
    312312<?php
    313313    } else {
    314         submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false ); 
     314        submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
    315315    }
    316316    submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
  • trunk/wp-includes/admin-bar.php

    r16310 r16438  
    55 * This code handles the building and rendering of the press bar.
    66 */
    7  
     7
    88/**
    99 * Instantiate the admin bar object and set it up as a global for access elsewhere.
     
    2323    /* Instantiate the admin bar */
    2424    $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
    25     if ( class_exists( $admin_bar_class ) ) 
     25    if ( class_exists( $admin_bar_class ) )
    2626        $wp_admin_bar = new $admin_bar_class;
    2727    else
    2828        return false;
    29    
     29
    3030    $wp_admin_bar->initialize();
    3131    $wp_admin_bar->add_menus();
     
    6161
    6262    do_action( 'wp_after_admin_bar_render' );
    63    
     63
    6464    $wp_admin_bar->unload_user_locale_translations();
    6565}
     
    8888
    8989    $user_id = get_current_user_id();
    90    
     90
    9191    if ( 0 != $user_id ) {
    9292        /* Add the 'My Account' menu */
    9393        $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity,  'href' => get_edit_profile_url( $user_id ) ) );
    94    
     94
    9595        /* Add the "My Account" sub menus */
    9696        $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) );
     
    158158/**
    159159 * Provide a shortlink.
    160  * 
     160 *
    161161 * @since 3.1.0
    162162 */
     
    172172/**
    173173 * Provide an edit link for posts and terms.
    174  * 
     174 *
    175175 * @since 3.1.0
    176176 */
     
    198198        if ( $ptype_obj->show_in_menu !== true || ! current_user_can( $ptype_obj->cap->edit_posts ) )
    199199            continue;
    200            
     200
    201201        $actions["post-new.php?post_type=$ptype"] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, "new-$ptype" );
    202202    }
     
    260260        $wordpress_update_count = 1;
    261261    */
    262  
     262
    263263    $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
    264264
     
    298298    ?>
    299299    <style type="text/css">
    300         <?php 
    301        
    302         if ( 
    303             ( empty( $_GET['nobump'] ) || is_admin() ) && 
    304             ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' ) 
    305         ) : 
     300        <?php
     301
     302        if (
     303            ( empty( $_GET['nobump'] ) || is_admin() ) &&
     304            ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' )
     305        ) :
    306306            ?>
    307307            body { padding-top: 28px !important; }
    308             <?php 
    309         endif; 
     308            <?php
     309        endif;
    310310
    311311        if ( in_array( get_current_theme(), array('H3', 'H4', 'The Journalist v1.9') ) ) :
     
    329329function is_admin_bar_showing() {
    330330    global $show_admin_bar;
    331    
     331
    332332    /* For all these types of request we never want an admin bar period */
    333333    if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
    334334        return false;
    335    
     335
    336336    if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
    337337        if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {
  • trunk/wp-includes/class-wp-admin-bar.php

    r16309 r16438  
    1414
    1515        /* Set the protocol used throughout this code */
    16         if ( is_ssl() ) 
     16        if ( is_ssl() )
    1717            $this->proto = 'https://';
    1818
     
    9898            <div id="adminbarsearch-wrap">
    9999                <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch">
    100                     <input class="adminbar-input" name="s" id="adminbar-search" type="text" title="<?php esc_attr_e( 'Search' ); ?>" value="" maxlength="150" /> 
     100                    <input class="adminbar-input" name="s" id="adminbar-search" type="text" title="<?php esc_attr_e( 'Search' ); ?>" value="" maxlength="150" />
    101101                    <button type="submit" class="adminbar-button"><span><?php _e('Search'); ?></span></button>
    102102                </form>
     
    113113        <?php $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?>
    114114
    115         <li class="<?php echo $menuclass . "ab-$id" ?><?php 
    116             if ( ! empty( $menu_item['meta']['class'] ) ) : 
     115        <li class="<?php echo $menuclass . "ab-$id" ?><?php
     116            if ( ! empty( $menu_item['meta']['class'] ) ) :
    117117                echo ' ' . $menu_item['meta']['class'];
    118             endif; 
     118            endif;
    119119        ?>">
    120             <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php 
     120            <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php
    121121                if ( ! empty( $menu_item['meta']['onclick'] ) ) :
    122                     ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php 
     122                    ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php
    123123                endif;
    124124            if ( ! empty( $menu_item['meta']['target'] ) ) :
    125                 ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php 
    126             endif; 
    127            
    128             ?>><?php 
    129            
    130             if ( ! empty( $menuclass ) ) : 
    131                 ?><span><?php 
    132             endif; 
    133            
     125                ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php
     126            endif;
     127
     128            ?>><?php
     129
     130            if ( ! empty( $menuclass ) ) :
     131                ?><span><?php
     132            endif;
     133
    134134            echo $menu_item['title'];
    135            
    136             if ( ! empty( $menuclass ) ) : 
    137                 ?></span><?php 
    138             endif; 
    139            
     135
     136            if ( ! empty( $menuclass ) ) :
     137                ?></span><?php
     138            endif;
     139
    140140            ?></a>
    141141
     
    165165                $this->add_node( $parent_id, $menu->{$id}['children'], $child );
    166166        }
    167        
     167
    168168        $child = null;
    169169
     
    205205    function load_user_locale_translations() {
    206206        $this->need_to_change_locale = ( get_locale() != $this->user->locale );
    207         if ( ! $this->need_to_change_locale ) 
     207        if ( ! $this->need_to_change_locale )
    208208            return;
    209209        /*
     
    219219    function unload_user_locale_translations() {
    220220        global $l10n;
    221         if ( ! $this->changed_locale ) 
     221        if ( ! $this->changed_locale )
    222222            return;
    223223        /*
  • trunk/wp-includes/class-wp-http-ixr-client.php

    r16149 r16438  
    2424            }
    2525        } else {
    26             $this->scheme = 'http'; 
     26            $this->scheme = 'http';
    2727            $this->server = $server;
    2828            $this->path = $path;
     
    4646            'body'       => $xml,
    4747        );
    48        
     48
    4949        // Merge Custom headers ala #8145
    5050        foreach ( $this->headers as $header => $value )
    5151            $args['headers'][$header] = $value;
    52        
     52
    5353        if ( $this->timeout !== false )
    5454            $args['timeout'] = $this->timeout;
    55            
     55
    5656        // Now send the request
    5757        if ($this->debug) {
     
    5959        }
    6060
    61         $response = wp_remote_post($url, $args); 
     61        $response = wp_remote_post($url, $args);
    6262
    63         if ( is_wp_error($response) ) { 
    64             $errno    = $response->get_error_code(); 
    65             $errorstr = $response->get_error_message(); 
    66             $this->error = new IXR_Error(-32300, "transport error: $errno $errstr"); 
     63        if ( is_wp_error($response) ) {
     64            $errno    = $response->get_error_code();
     65            $errorstr = $response->get_error_message();
     66            $this->error = new IXR_Error(-32300, "transport error: $errno $errstr");
    6767            return false;
    6868        }
    69    
    70         $code = $response['response']['code']; 
    71         if ( $code != 200 ) { 
     69
     70        $code = $response['response']['code'];
     71        if ( $code != 200 ) {
    7272            $this->error = new IXR_Error(-32301, "transport error - HTTP status code was not 200 ($code)");             return false;
    7373        }
  • trunk/wp-includes/class-wp-xmlrpc-server.php

    r16331 r16438  
    14891489     * @since 3.1.0
    14901490     *
    1491      * @param array $args Method parameters. Contains: 
     1491     * @param array $args Method parameters. Contains:
    14921492     *  - blog_id
    14931493     *  - username
    14941494     *  - password
    14951495     *  - attachment_id
    1496      * @return array. Assocciative array containing: 
     1496     * @return array. Assocciative array containing:
    14971497     *  - 'date_created_gmt'
    14981498     *  - 'parent'
     
    15461546    /**
    15471547     * Retrieves a collection of media library items (or attachments)
    1548      * 
    1549      * Besides the common blog_id, username, and password arguments, it takes a filter 
     1548     *
     1549     * Besides the common blog_id, username, and password arguments, it takes a filter
    15501550     * array as last argument.
    1551      * 
     1551     *
    15521552     * Accepted 'filter' keys are 'parent_id', 'mime_type', 'offset', and 'number'.
    1553      * 
     1553     *
    15541554     * The defaults are as follows:
    15551555     * - 'number' - Default is 5. Total number of media items to retrieve.
     
    15571557     * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
    15581558     * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
    1559      * 
     1559     *
    15601560     * @since 3.1.0
    15611561     *
     
    15881588        $offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0 ;
    15891589        $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
    1590        
     1590
    15911591        $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
    15921592        $num_attachments = count($attachments);
  • trunk/wp-includes/class.wp-scripts.php

    r16282 r16438  
    186186        if ( 0 === strpos( $src, '/wp-includes/js/l10n' ) )
    187187            return false;
    188            
     188
    189189        foreach ( (array) $this->default_dirs as $test ) {
    190190            if ( 0 === strpos($src, $test) )
  • trunk/wp-includes/comment.php

    r16365 r16438  
    17651765    include_once(ABSPATH . WPINC . '/class-IXR.php');
    17661766    include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
    1767    
     1767
    17681768    // original code by Mort (http://mort.mine.nu:8080)
    17691769    $post_links = array();
  • trunk/wp-includes/formatting.php

    r16431 r16438  
    224224/**
    225225 * Newline preservation help function for wpautop
    226  * 
     226 *
    227227 * @since 3.1.0
    228228 * @access private
     
    738738 *
    739739 * Removes tags, octets, entities, and if strict is enabled, will only keep
    740  * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username, 
     740 * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username,
    741741 * raw username (the username in the parameter), and the value of $strict as
    742742 * parameters for the 'sanitize_user' filter.
     
    15751575/**
    15761576 * Helper function to convert hex encoded chars to ascii
    1577  * 
     1577 *
    15781578 * @since 3.1.0
    15791579 * @access private
    15801580 * @param $match the preg_replace_callback matches array
    15811581 */
    1582 function _wp_iso_convert( $match ) { 
    1583     return chr( hexdec( strtolower( $match[1] ) ) ); 
    1584 } 
     1582function _wp_iso_convert( $match ) {
     1583    return chr( hexdec( strtolower( $match[1] ) ) );
     1584}
    15851585
    15861586/**
  • trunk/wp-includes/functions.php

    r16392 r16438  
    120120    }
    121121    $timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
    122     $timezone_formats_re = implode( '|', $timezone_formats );   
     122    $timezone_formats_re = implode( '|', $timezone_formats );
    123123    if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) && wp_timezone_supported() ) {
    124124        $timezone_string = get_option( 'timezone_string' );
     
    133133                    $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
    134134                }
    135             }           
     135            }
    136136        }
    137     } 
     137    }
    138138    $j = @$datefunc( $dateformatstring, $i );
    139139    // allow plugins to redo this entirely for languages with untypical grammars
     
    11851185function do_enclose( $content, $post_ID ) {
    11861186    global $wpdb;
    1187    
     1187
    11881188    //TODO: Tidy this ghetto code up and make the debug code optional
    11891189    include_once( ABSPATH . WPINC . '/class-IXR.php' );
  • trunk/wp-includes/l10n.php

    r16075 r16438  
    290290/**
    291291 * Translate the result of _n_noop() or _nx_noop()
    292  * 
     292 *
    293293 * @since 3.1
    294294 * @param array $nooped_plural array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()
  • trunk/wp-includes/ms-admin-bar.php

    r16098 r16438  
    1313    /* Get the settings we need for the current site */
    1414    $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog';
    15     $maturetext_confirm = $current_blog->mature ? 
    16         sprintf( 
     15    $maturetext_confirm = $current_blog->mature ?
     16        sprintf(
    1717            esc_attr__( 'Are you sure you want to unmark %s as mature?' ),
    1818            $current_blog->domain
    19         ) : 
     19        ) :
    2020        sprintf(
    2121            esc_attr__( 'Are you sure you want to mark %s as mature?' ),
     
    2525    $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog';
    2626    $suspendtext_confirm = $current_blog->spam ?
    27         sprintf( 
     27        sprintf(
    2828            esc_attr__( 'Are you sure you want to unsuspend site %s?' ),
    2929            $current_blog->domain
    30         ) : 
     30        ) :
    3131        sprintf(
    3232            esc_attr__( 'Are you sure you want to suspend site %s?' ),
    3333            $current_blog->domain
    3434        );
    35        
     35
    3636    $mature_url = network_admin_url( "edit.php?action=confirm&amp;action2={$matureaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( $maturetext_confirm ) );
    3737    $suspend_url = network_admin_url( "edit.php?action=confirm&amp;action2={$suspendaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( $suspendtext_confirm ) );
  • trunk/wp-includes/ms-functions.php

    r16299 r16438  
    13751375function add_existing_user_to_blog( $details = false ) {
    13761376    global $blog_id;
    1377    
     1377
    13781378    if ( is_array( $details ) ) {
    13791379        $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
  • trunk/wp-includes/post-template.php

    r16432 r16438  
    231231/**
    232232 * Preview fix for javascript bug with foreign languages
    233  * 
     233 *
    234234 * @since 3.1.0
    235235 * @access private
     
    238238 */
    239239function _convert_urlencoded_to_entities( $match ) {
    240     return '&#' . base_convert( $match[1], 16, 10 ) . ';'; 
     240    return '&#' . base_convert( $match[1], 16, 10 ) . ';';
    241241}
    242242
     
    328328    $classes[] = 'type-' . $post->post_type;
    329329    $classes[] = 'status-' . $post->post_status;
    330    
     330
    331331    // Post Format
    332332    $post_format = get_post_format( $post->ID );
     
    340340    if ( post_password_required($post->ID) )
    341341        $classes[] = 'post-password-required';
    342    
     342
    343343    // sticky for Sticky Posts
    344344    if ( is_sticky($post->ID) && is_home() && !is_paged() )
     
    429429        $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
    430430        $classes[] = 'postid-' . $post_id;
    431        
     431
    432432        // Post Format
    433433        $post_format = get_post_format( $post->ID );
  • trunk/wp-includes/post.php

    r16431 r16438  
    22742274        $args = array( 'numberposts' => absint( $args ) );
    22752275    }
    2276    
     2276
    22772277    // Set default arguments
    22782278    $defaults = array(
     
    31383138        $curpage = $page;
    31393139        while ( $curpage->post_parent != 0 ) {
    3140             $post_parent = $curpage->post_parent; 
    3141             $curpage = wp_cache_get( $post_parent, 'posts' ); 
    3142             if ( false === $curpage ) 
     3140            $post_parent = $curpage->post_parent;
     3141            $curpage = wp_cache_get( $post_parent, 'posts' );
     3142            if ( false === $curpage )
    31433143                $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type = %s", $post_parent, $post_type ) );
    31443144            $path = '/' . $curpage->post_name . $path;
     
    52425242 * @since 3.1.0
    52435243 *
    5244  * @return array The array of translations 
     5244 * @return array The array of translations
    52455245 */
    52465246function get_post_format_strings() {
     
    52615261/**
    52625262 * Returns a pretty, translated version of a post format slug
    5263  * 
     5263 *
    52645264 * @since 3.1.0
    52655265 *
  • trunk/wp-includes/query.php

    r16414 r16438  
    4646/**
    4747 * Retrieve ID of the current queried object. Wrapper for $wp_query->get_queried_object_id()
    48  * 
     48 *
    4949 * @uses WP_Query::get_queried_object_id()
    5050 *
  • trunk/wp-includes/script-loader.php

    r16436 r16438  
    6262    $scripts->add( 'l10n', "/wp-includes/js/l10n$suffix.js", false, '20101110' );
    6363    $scripts->enqueue( 'l10n' );
    64    
     64
    6565    $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
    6666
     
    261261
    262262    $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
    263     $scripts->add_data( 'user-profile', 'group', 1 );   
     263    $scripts->add_data( 'user-profile', 'group', 1 );
    264264
    265265    $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101117');
    266     $scripts->add_data( 'admin-bar', 'group', 1 ); 
     266    $scripts->add_data( 'admin-bar', 'group', 1 );
    267267    $scripts->localize( 'admin-bar', 'adminBarL10n', array(
    268268        'url' => __( 'URL:' ),
    269269        'noShortlink' => __( 'No shortlink available for this page.' ),
    270270    ) );
    271    
     271
    272272    if ( is_admin() ) {
    273273        $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
     
    502502    $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
    503503    $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
    504    
     504
    505505    // Admin bar
    506506    $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101117' );
  • trunk/wp-includes/taxonomy.php

    r16423 r16438  
    591591            // NOT IN is very slow for some reason
    592592            $where .= " AND $primary_table.$primary_id_column IN (
    593                 SELECT object_id 
    594                 FROM $wpdb->term_relationships 
    595                 WHERE term_taxonomy_id $operator ($terms) 
    596             )";         
     593                SELECT object_id
     594                FROM $wpdb->term_relationships
     595                WHERE term_taxonomy_id $operator ($terms)
     596            )";
    597597        }
    598598    }
     
    11801180        $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
    11811181
    1182     $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";   
     1182    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
    11831183
    11841184    $fields = $_fields;
Note: See TracChangeset for help on using the changeset viewer.