WordPress.org

Make WordPress Core

Changeset 17228


Ignore:
Timestamp:
01/06/2011 04:11:14 AM (11 years ago)
Author:
ryan
Message:

Bring out the shears.

Location:
trunk
Files:
26 edited

Legend:

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

    r17113 r17228  
    674674            if ( 'single' == $_REQUEST['mode'] ) {
    675675                $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
    676             } else {               
     676            } else {
    677677                $wp_list_table = get_list_table('WP_Comments_List_Table');
    678678            }
  • trunk/wp-admin/css/colors-classic.dev.css

    r17202 r17228  
    14651465}
    14661466
    1467 #post-body ul.category-tabs li.tabs a, 
     1467#post-body ul.category-tabs li.tabs a,
    14681468#post-body ul.add-menu-item-tabs li.tabs a,
    14691469body.press-this ul.category-tabs li.tabs a {
  • trunk/wp-admin/includes/class-wp-comments-list-table.php

    r17168 r17228  
    6767
    6868        $page = $this->get_pagenum();
    69        
     69
    7070        if ( isset( $_REQUEST['start'] ) ) {
    7171            $start = $_REQUEST['start'];
     
    7373            $start = ( $page - 1 ) * $comments_per_page;
    7474        }
    75        
     75
    7676        if ( $doing_ajax && isset( $_REQUEST['offset'] ) ) {
    7777            $start += $_REQUEST['offset'];
     
    116116        ) );
    117117    }
    118    
     118
    119119    function get_per_page( $comment_status = 'all' ) {
    120120        $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
     
    514514
    515515    function get_column_info() {
    516         $this->_column_headers = array( 
     516        $this->_column_headers = array(
    517517            array(
    518518            'author'   => __( 'Author' ),
     
    522522            array(),
    523523        );
    524        
     524
    525525        return $this->_column_headers;
    526526    }
    527    
     527
    528528    function get_table_classes() {
    529529        $classes = parent::get_table_classes();
     
    531531        return $classes;
    532532    }
    533    
     533
    534534    function display( $output_empty = false ) {
    535535        extract( $this->_args );
     
    542542<?php
    543543    }
    544    
     544
    545545    function get_per_page( $comment_status = false ) {
    546546        return 10;
  • trunk/wp-admin/includes/class-wp-list-table.php

    r17206 r17228  
    186186     *
    187187     * @param string $text The search button text
    188      * @param string $input_id The search input id 
     188     * @param string $input_id The search input id
    189189     */
    190190    function search_box( $text, $input_id ) {
  • trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

    r17177 r17228  
    292292        $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
    293293        $actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );
    294  
     294
    295295        $class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
    296296        $checkbox_id = "checkbox_" . md5($theme['Name']);
  • trunk/wp-admin/includes/class-wp-plugins-list-table.php

    r17129 r17228  
    234234                    break;
    235235            }
    236            
     236
    237237            if ( 'search' != $type ) {
    238238                $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
  • trunk/wp-admin/includes/class-wp-terms-list-table.php

    r17193 r17228  
    7272        ) );
    7373    }
    74    
     74
    7575    function has_items() {
    7676        // todo: populate $this->items in prepare_items()
     
    140140        $out = '';
    141141        $count = 0;
    142        
     142
    143143        $terms = array();
    144144
     
    161161            $count = $number; // Only displaying a single page.
    162162        }
    163        
     163
    164164        if ( empty( $terms ) ) {
    165165            echo '<tr class="no-items"><td colspan="2">';
  • trunk/wp-admin/includes/ms.php

    r17215 r17228  
    350350    if ( get_site_option( 'upload_space_check_disabled' ) )
    351351        return min( $size, $fileupload_maxk );
    352        
     352
    353353    return min( $size, $fileupload_maxk, get_upload_space_available() );
    354354}
  • trunk/wp-admin/includes/post.php

    r17223 r17228  
    12221222    $time = $lock[0];
    12231223    $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
    1224    
     1224
    12251225    $time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 );
    12261226
  • trunk/wp-admin/includes/template.php

    r17191 r17228  
    331331        return;
    332332    }
    333    
     333
    334334    if ( $mode == 'single' ) {
    335335        $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
  • trunk/wp-admin/js/edit-comments.dev.js

    r17124 r17228  
    214214        refillTheExtraList();
    215215    };
    216    
     216
    217217    var refillTheExtraList = function(ev) {
    218218        var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val();
    219        
     219
    220220        if (args.paged > total_pages) {
    221221            return;
     
    229229            args.offset = per_page - 1; // fetch only the last item of the next page
    230230        }
    231        
     231
    232232        args.no_placeholder = true;
    233233
     
    278278
    279279        this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || '';
    280        
     280
    281281        $(listTable).bind('beforeChangePage', function(){
    282282            commentReply.close();
  • trunk/wp-admin/js/list-table.dev.js

    r17206 r17228  
    161161            if ( $el.parents('.tablenav.bottom').length )
    162162                scrollTo(0, 0);
    163                
     163
    164164            $(listTable).trigger('changePage');
    165165        });
     
    257257                return;
    258258
    259             if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) { 
     259            if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) {
    260260                $('h4.search-text').remove();
    261261
    262262                if ( data.s )
    263                     $('ul.subsubsub').after($('<h4 class="clear search-text">').html( 
    264                         listTableL10n.search.replace('%s', this.htmlencode(data.s)) 
     263                    $('ul.subsubsub').after($('<h4 class="clear search-text">').html(
     264                        listTableL10n.search.replace('%s', this.htmlencode(data.s))
    265265                    ));
    266             } else { 
     266            } else {
    267267                $('h2 .subtitle').remove();
    268268
    269                 if ( data.s ) 
    270                     $('h2').append($('<span class="subtitle">').html( 
    271                         listTableL10n.search.replace('%s', this.htmlencode(data.s)) 
    272                     )); 
     269                if ( data.s )
     270                    $('h2').append($('<span class="subtitle">').html(
     271                        listTableL10n.search.replace('%s', this.htmlencode(data.s))
     272                    ));
    273273            }
    274274        });
  • trunk/wp-admin/post.php

    r17169 r17228  
    163163        $submenu_file = "edit.php";
    164164    } else {
    165         if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) 
     165        if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
    166166            $parent_file = $post_type_object->show_in_menu;
    167167        else
  • trunk/wp-includes/admin-bar.php

    r17161 r17228  
    357357    if ( false === $pref )
    358358        return 'admin' != $context || is_multisite();
    359    
     359
    360360    return 'true' === $pref;
    361361}
  • trunk/wp-includes/formatting.php

    r17171 r17228  
    13141314    $url = $matches[2];
    13151315    $suffix = '';
    1316    
     1316
    13171317    /** Include parentheses in the URL only if paired **/
    13181318    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
    1319         $suffix = strrchr( $url, ')' ) . $suffix; 
    1320         $url = substr( $url, 0, strrpos( $url, ')' ) ); 
     1319        $suffix = strrchr( $url, ')' ) . $suffix;
     1320        $url = substr( $url, 0, strrpos( $url, ')' ) );
    13211321    }
    13221322
  • trunk/wp-includes/js/tinymce/plugins/wplink/css/wplink.dev.css

    r17133 r17228  
    55
    66#wp-link ol,
    7 #wp-link ul { 
     7#wp-link ul {
    88    list-style: none;
    99    margin: 0;
    10     padding: 0; 
     10    padding: 0;
    1111}
    1212
  • trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js

    r17117 r17228  
    252252                visible = !panel.is(':visible'),
    253253                win = $(window);
    254            
     254
    255255            $(this).toggleClass('toggle-arrow-active', visible);
    256            
     256
    257257            inputs.dialog.height('auto');
    258258            panel.slideToggle( 300, function() {
    259259                setUserSetting('wplink', visible ? '1' : '0');
    260260                inputs[ visible ? 'search' : 'url' ].focus();
    261                
     261
    262262                // Move the box if the box is now expanded, was opened in a collapsed state,
    263263                // and if it needs to be moved. (Judged by bottom not being positive or
     
    267267                    bottom = top + widget.outerHeight(),
    268268                    diff = bottom - win.height();
    269                
     269
    270270                if ( diff > scroll ) {
    271271                    widget.animate({'top': diff < top ?  top - diff : scroll }, 200);
  • trunk/wp-includes/js/wp-lists.dev.js

    r17113 r17228  
    324324        var list = this,
    325325            $el = $(el || document);
    326    
     326
    327327        $el.delegate( "form[class^=add:" + list.id + ":]", 'submit', function(){
    328328            return list.wpList.add(this);
     
    332332            return list.wpList.add(this);
    333333        });
    334        
     334
    335335        $el.delegate( "[class^=delete:" + list.id + ":]", 'click', function(){
    336336            return list.wpList.del(this);
  • trunk/wp-includes/kses.php

    r17185 r17228  
    1818 * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  or visit
    1919 * http://www.gnu.org/licenses/gpl.html
    20  * 
     20 *
    2121 * [kses strips evil scripts!]
    2222 *
  • trunk/wp-includes/link-template.php

    r17102 r17228  
    275275
    276276    $link = $wp_rewrite->get_page_permastruct();
    277        
    278     if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {   
     277
     278    if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
    279279        if ( ! $leavename ) {
    280280            $link = str_replace('%pagename%', get_page_uri($id), $link);
  • trunk/wp-includes/ms-functions.php

    r17218 r17228  
    456456 * at wp-admin/network/settings.php. The check is only run on
    457457 * self-registrations; user creation at wp-admin/network/users.php
    458  * bypasses this check. 
     458 * bypasses this check.
    459459 *
    460460 * @since MU
     
    613613 * effectively an override of this limitation.
    614614 *
    615  * Filter 'wpmu_validate_blog_signup' if you want to modify 
     615 * Filter 'wpmu_validate_blog_signup' if you want to modify
    616616 * the way that WordPress validates new site signups.
    617617 *
     
    15781578 * Check an array of MIME types against a whitelist.
    15791579 *
    1580  * WordPress ships with a set of allowed upload filetypes, 
     1580 * WordPress ships with a set of allowed upload filetypes,
    15811581 * which is defined in wp-includes/functions.php in
    15821582 * get_allowed_mime_types(). This function is used to filter
    1583  * that list against the filetype whitelist provided by Multisite 
    1584  * Super Admins at wp-admin/network/settings.php. 
     1583 * that list against the filetype whitelist provided by Multisite
     1584 * Super Admins at wp-admin/network/settings.php.
    15851585 *
    15861586 * @since MU
     
    18071807 * @since MU
    18081808 * @uses add_existing_user_to_blog()
    1809  */ 
     1809 */
    18101810function maybe_add_existing_user_to_blog() {
    18111811    if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
     
    18331833 * @since MU
    18341834 * @uses add_user_to_blog()
    1835  * 
     1835 *
    18361836 * @param array $details
    1837  */ 
     1837 */
    18381838function add_existing_user_to_blog( $details = false ) {
    18391839    global $blog_id;
     
    18501850 *
    18511851 * @since MU
    1852  * 
     1852 *
    18531853 * @param int $user_id
    18541854 * @param string $email
    18551855 * @param array $meta
    1856  */ 
     1856 */
    18571857function add_new_user_to_blog( $user_id, $email, $meta ) {
    18581858    global $current_site;
     
    18701870 *
    18711871 * @since MU
    1872  */ 
     1872 */
    18731873function fix_phpmailer_messageid( $phpmailer ) {
    18741874    global $current_site;
     
    18851885 * @param string $username
    18861886 * @return bool
    1887  */ 
     1887 */
    18881888function is_user_spammy( $username = 0 ) {
    18891889    if ( $username == 0 ) {
     
    19081908 * @param int $value The new public value
    19091909 * @return bool
    1910  */ 
     1910 */
    19111911function update_blog_public( $old_value, $value ) {
    19121912    global $wpdb;
     
    19231923 *
    19241924 * @return int
    1925  */ 
     1925 */
    19261926function get_dashboard_blog() {
    19271927    if ( $blog = get_site_option( 'dashboard_blog' ) )
     
    19411941 * @param int $blog_id Optional. Defaults to current blog.
    19421942 * @return bool
    1943  */ 
     1943 */
    19441944function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
    19451945    global $wpdb;
     
    19651965 *
    19661966 * @return bool
    1967  */ 
     1967 */
    19681968function users_can_register_signup_filter() {
    19691969    $registration = get_site_option('registration');
     
    19821982 * @param string $text
    19831983 * @return string
    1984  */ 
     1984 */
    19851985function welcome_user_msg_filter( $text ) {
    19861986    if ( !$text ) {
  • trunk/wp-includes/nav-menu-template.php

    r17109 r17228  
    427427                    isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
    428428                    in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
    429                     (   
     429                    (
    430430                        ! isset( $queried_object->term_id ) ||
    431431                        $parent_item->object_id != $queried_object->term_id
  • trunk/wp-includes/post.php

    r17224 r17228  
    620620 * exclude_from_search - Whether to exclude posts with this post status from search results. Defaults to true.
    621621 * show_in_admin_all_list - Whether to include posts in the edit listing for their post type
    622  * show_in_admin_status_list - Show in the list of statuses with post counts at the top of the edit 
     622 * show_in_admin_status_list - Show in the list of statuses with post counts at the top of the edit
    623623 *                             listings, e.g. All (12) | Published (9) | My Custom Status (2) ...
    624  * 
     624 *
    625625 * Arguments prefixed with an _underscore shouldn't be used by plugins and themes.
    626626 *
  • trunk/wp-includes/taxonomy.php

    r17155 r17228  
    29132913    $args = wp_parse_args( $args, array(
    29142914        'template' => '%s: %l.',
    2915     ) );   
     2915    ) );
    29162916    extract( $args, EXTR_SKIP );
    29172917
  • trunk/wp-includes/theme.php

    r17220 r17228  
    17551755    else
    17561756        $_wp_theme_features[$feature] = array_slice( func_get_args(), 1 );
    1757        
     1757
    17581758    if ( $feature == 'post-formats' && is_array( $_wp_theme_features[$feature][0] ) )
    17591759        $_wp_theme_features[$feature][0] = array_intersect( $_wp_theme_features[$feature][0], array_keys( get_post_format_slugs() ) );
  • trunk/wp-includes/user.php

    r17227 r17228  
    14581458    if ( empty($user_registered) )
    14591459        $user_registered = gmdate('Y-m-d H:i:s');
    1460        
     1460
    14611461    if ( empty($show_admin_bar_front) )
    14621462        $show_admin_bar_front = 'true';
    1463            
     1463
    14641464    if ( empty($show_admin_bar_admin) )
    14651465        $show_admin_bar_admin = is_multisite() ? 'true' : 'false';
Note: See TracChangeset for help on using the changeset viewer.