WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

List Tables: only hide bulk actions when there are no items, don't hide all of the extra table nav. 

Fixes #33824.

Built from https://develop.svn.wordpress.org/trunk@34707


git-svn-id: http://core.svn.wordpress.org/trunk@34671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-30 00:47:27 +00:00
parent 471a507dfd
commit 882c34d555
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/class-wp-list-table.php
View File

@ -1141,13 +1141,14 @@ class WP_List_Table {
if ( 'top' === $which ) { if ( 'top' === $which ) {
wp_nonce_field( 'bulk-' . $this->_args['plural'] ); wp_nonce_field( 'bulk-' . $this->_args['plural'] );
} }
if ( $this->has_items() ) : ?> ?>
<div class="tablenav <?php echo esc_attr( $which ); ?>"> <div class="tablenav <?php echo esc_attr( $which ); ?>">
<?php if ( $this->has_items() ): ?>
<div class="alignleft actions bulkactions"> <div class="alignleft actions bulkactions">
<?php $this->bulk_actions( $which ); ?> <?php $this->bulk_actions( $which ); ?>
</div> </div>
<?php <?php endif;
$this->extra_tablenav( $which ); $this->extra_tablenav( $which );
$this->pagination( $which ); $this->pagination( $which );
?> ?>
@ -1155,7 +1156,6 @@ class WP_List_Table {
<br class="clear" /> <br class="clear" />
</div> </div>
<?php <?php
endif;
} }
/** /**

2
wp-admin/includes/class-wp-users-list-table.php
View File

@ -217,7 +217,7 @@ class WP_Users_List_Table extends WP_List_Table {
$id = 'bottom' === $which ? 'new_role2' : 'new_role'; $id = 'bottom' === $which ? 'new_role2' : 'new_role';
?> ?>
<div class="alignleft actions"> <div class="alignleft actions">
<?php if ( current_user_can( 'promote_users' ) ) : ?> <?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'Change role to&hellip;' ) ?></label> <label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'Change role to&hellip;' ) ?></label>
<select name="<?php echo $id ?>" id="<?php echo $id ?>"> <select name="<?php echo $id ?>" id="<?php echo $id ?>">
<option value=""><?php _e( 'Change role to&hellip;' ) ?></option> <option value=""><?php _e( 'Change role to&hellip;' ) ?></option>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34706'; $wp_version = '4.4-alpha-34707';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.