WordPress.org

Make WordPress Core

Ticket #12086: 12086.diff

File 12086.diff, 8.7 KB (added by nacin, 4 years ago)
  • wp-admin/edit-comments.php

     
    192192        $link = add_query_arg( 'comment_type', $comment_type, $link ); 
    193193 
    194194foreach ( $stati as $status => $label ) { 
    195         $class = ''; 
     195        $class = ( $status == $comment_status ) ? ' class="current"' : ''; 
    196196 
    197         if ( $status == $comment_status ) 
    198                 $class = ' class="current"'; 
    199197        if ( !isset( $num_comments->$status ) ) 
    200198                $num_comments->$status = 10; 
     199        if ( empty( $num_comments->$status ) ) 
     200                continue; 
    201201        $link = add_query_arg( 'comment_status', $status, $link ); 
    202202        if ( $post_id ) 
    203203                $link = add_query_arg( 'p', absint( $post_id ), $link ); 
     
    270270 
    271271<div class="tablenav"> 
    272272 
     273<?php if ( $comments ) { ?> 
    273274<?php if ( $page_links ) : ?> 
    274275<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s', 
    275276        number_format_i18n( $start + 1 ), 
     
    346347 
    347348<div class="clear"></div> 
    348349 
    349 <?php if ( $comments ) { ?> 
    350350<table class="widefat comments fixed" cellspacing="0"> 
    351351<thead> 
    352352        <tr> 
  • wp-admin/upload.php

     
    143143        } else { 
    144144                $start = ( (int) $_GET['paged'] - 1 ) * $media_per_page; 
    145145                $orphans = $wpdb->get_results( $wpdb->prepare( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1 LIMIT %d, %d", $start, $media_per_page ) ); 
    146                 $page_links_total = ceil($wpdb->get_var( "SELECT FOUND_ROWS()" ) / $media_per_page); 
     146                $total_orphans = $wpdb->get_var( "SELECT FOUND_ROWS()" ); 
     147                $page_links_total = ceil( $total_orphans / $media_per_page ); 
    147148        } 
    148149 
    149150        $post_mime_types = get_post_mime_types(); 
     
    219220$type_links = array(); 
    220221$_num_posts = (array) wp_count_attachments(); 
    221222$_total_posts = array_sum($_num_posts) - $_num_posts['trash']; 
     223if ( !isset( $total_orphans ) ) 
     224                $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" ); 
    222225$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts)); 
    223226foreach ( $matches as $type => $reals ) 
    224227        foreach ( $reals as $real ) 
     
    234237 
    235238        if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) 
    236239                $class = ' class="current"'; 
     240        if ( !empty( $num_posts[$mime_type] ) ) 
     241                $type_links[] = "<li><a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( _n( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>'; 
     242} 
     243$type_links[] = '<li><a href="upload.php?detached=1"' . ( isset($_GET['detached']) ? ' class="current"' : '' ) . '>' . sprintf( _nx( 'Unattached <span class="count">(%s)</span>', 'Unattached <span class="count">(%s)</span>', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</a>'; 
    237244 
    238         $type_links[] = "<li><a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( _n( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>'; 
    239 } 
    240 $type_links[] = '<li><a href="upload.php?detached=1"' . ( isset($_GET['detached']) ? ' class="current"' : '' ) . '>' . __('Unattached') . '</a>'; 
    241 if ( EMPTY_TRASH_DAYS && ( MEDIA_TRASH || !empty($_num_posts['trash']) ) ) 
     245if ( !empty($_num_posts['trash']) ) 
    242246        $type_links[] = '<li><a href="upload.php?status=trash"' . ( (isset($_GET['status']) && $_GET['status'] == 'trash' ) ? ' class="current"' : '') . '>' . sprintf( _nx( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</a>'; 
    243247 
    244248echo implode( " |</li>\n", $type_links) . '</li>'; 
     
    255259</form> 
    256260 
    257261<form id="posts-filter" action="" method="get"> 
     262<?php if ( have_posts() || isset( $orphans ) ) { ?> 
    258263<div class="tablenav"> 
    259264<?php 
     265 
    260266if ( ! isset($page_links_total) ) 
    261267        $page_links_total =  $wp_query->max_num_pages; 
    262268 
     
    279285<?php endif; ?> 
    280286 
    281287<div class="alignleft actions"> 
     288<?php if ( ! isset( $orphans ) || ! empty( $orphans ) ) { ?> 
    282289<select name="action" class="select-action"> 
    283290<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> 
    284291<?php if ( $is_trash ) { ?> 
     
    328335 
    329336<?php } // ! is_singular ?> 
    330337 
    331 <?php if ( isset($_GET['detached']) ) { ?> 
     338<?php 
     339 
     340} // ! empty( $orphans ) 
     341 
     342if ( isset($_GET['detached']) ) { ?> 
    332343        <input type="submit" id="find_detached" name="find_detached" value="<?php esc_attr_e('Scan for lost attachments'); ?>" class="button-secondary" /> 
    333344<?php } elseif ( isset($_GET['status']) && $_GET['status'] == 'trash' && current_user_can('edit_others_posts') ) { ?> 
    334345        <input type="submit" id="delete_all" name="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" /> 
     
    339350<br class="clear" /> 
    340351</div> 
    341352 
     353<?php } // have_posts() || !empty( $orphans ) ?> 
     354 
    342355<div class="clear"></div> 
    343356 
    344 <?php if ( isset($orphans) ) { ?> 
     357<?php if ( ! empty( $orphans ) ) { ?> 
    345358<table class="widefat" cellspacing="0"> 
    346359<thead> 
    347360<tr> 
     
    365378 
    366379<tbody id="the-list" class="list:post"> 
    367380<?php 
    368         if ( $orphans ) { 
    369381                foreach ( $orphans as $post ) { 
    370382                        $class = 'alternate' == $class ? '' : 'alternate'; 
    371383                        $att_title = esc_html( _draft_or_post_title($post->ID) ); 
     
    423435                } ?> 
    424436                <td class="date column-date"><?php echo $h_time ?></td> 
    425437        </tr> 
    426 <?php   } 
    427  
    428         } else { ?> 
    429         <tr><td colspan="5"><?php _e('No media attachments found.') ?></td></tr> 
    430 <?php } ?> 
     438<?php   } ?> 
    431439</tbody> 
    432440</table> 
    433441 
     
    442450<div class="tablenav"> 
    443451 
    444452<?php 
     453if ( have_posts() || ! empty( $orphans ) ) { 
     454 
    445455if ( $page_links ) 
    446456        echo "<div class='tablenav-pages'>$page_links_text</div>"; 
    447457?> 
     
    466476<?php } ?> 
    467477</div> 
    468478 
     479<?php } ?> 
    469480<br class="clear" /> 
    470481</div> 
    471482<?php find_posts_div(); ?> 
  • wp-admin/plugins.php

     
    630630?> 
    631631</ul> 
    632632 
     633<?php if ( ! empty( $plugins ) ) { ?> 
     634 
    633635<div class="tablenav"> 
     636 
    634637<?php 
     638 
    635639if ( $page_links ) 
    636640        echo '<div class="tablenav-pages">', $page_links_text, '</div>'; 
    637641 
     
    653657print_plugin_actions($status, "action2"); 
    654658?> 
    655659</div> 
     660<?php } elseif ( ! empty( $all_plugins ) ) { ?> 
     661<p><?php __( 'No plugins found.' ); ?></p> 
     662<?php } ?> 
    656663</form> 
    657664 
    658665<?php if ( empty($all_plugins) ) : ?> 
     666<br class="clear" /> 
    659667<p><?php _e('You do not appear to have any plugins available at this time.') ?></p> 
    660668<?php endif; ?> 
    661669 
  • wp-admin/edit.php

     
    400400<div class="clear"></div> 
    401401<p><?php 
    402402if ( isset($_GET['post_status']) && 'trash' == $_GET['post_status'] ) 
    403         _e('No posts found in the trash'); 
     403        _e( 'No posts found in the Trash.' ); 
    404404else 
    405         _e('No posts found'); 
     405        _e( 'No posts found.' ); 
    406406?></p> 
    407407<?php } ?> 
    408408 
  • wp-admin/link-manager.php

     
    9999<form id="posts-filter" action="" method="get"> 
    100100<div class="tablenav"> 
    101101 
     102<?php 
     103if ( 'all' == $cat_id ) 
     104        $cat_id = ''; 
     105$args = array( 'category' => $cat_id, 'hide_invisible' => 0, 'orderby' => $sqlorderby, 'hide_empty' => 0 ); 
     106if ( ! empty( $_GET['s'] ) ) 
     107        $args['search'] = $_GET['s']; 
     108$links = get_bookmarks( $args ); 
     109if ( $links ) { 
     110?> 
     111 
    102112<div class="alignleft actions"> 
    103113<select name="action"> 
    104114<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> 
     
    135145<div class="clear"></div> 
    136146 
    137147<?php 
    138 if ( 'all' == $cat_id ) 
    139         $cat_id = ''; 
    140 $args = array('category' => $cat_id, 'hide_invisible' => 0, 'orderby' => $sqlorderby, 'hide_empty' => 0); 
    141 if ( !empty($_GET['s']) ) 
    142         $args['search'] = $_GET['s']; 
    143 $links = get_bookmarks( $args ); 
    144 if ( $links ) { 
    145148        $link_columns = get_column_headers('link-manager'); 
    146149        $hidden = get_hidden_columns('link-manager'); 
    147150?> 
     
    251254        </tbody> 
    252255</table> 
    253256 
    254 <?php } else { ?> 
    255 <p><?php _e('No links found.') ?></p> 
    256 <?php } ?> 
    257  
    258257<div class="tablenav"> 
    259258 
    260259<div class="alignleft actions"> 
     
    265264<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> 
    266265</div> 
    267266 
     267<?php } else { ?> 
     268<p><?php _e( 'No links found.' ) ?></p> 
     269<?php } ?> 
     270 
    268271<br class="clear" /> 
    269272</div> 
    270273