diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 118fb49a7f..1866ba2bb0 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -343,8 +343,10 @@ class WP_List_Table { * * @since 3.1.0 * @access protected + * + * @param string $which The location of the bulk actions: 'top' or 'bottom'. */ - protected function bulk_actions() { + protected function bulk_actions( $which ) { if ( is_null( $this->_actions ) ) { $no_new_actions = $this->_actions = $this->get_bulk_actions(); /** @@ -369,7 +371,8 @@ class WP_List_Table { if ( empty( $this->_actions ) ) return; - echo "\n"; echo "\n"; foreach ( $this->_actions as $name => $title ) { @@ -638,7 +641,8 @@ class WP_List_Table { if ( 'bottom' == $which ) { $html_current_page = $current; } else { - $html_current_page = sprintf( "", + $html_current_page_label = ""; + $html_current_page = $html_current_page_label . sprintf( "", esc_attr__( 'Current page' ), $current, strlen( $total_pages ) @@ -898,7 +902,7 @@ class WP_List_Table {
- bulk_actions(); ?> + bulk_actions( $which ); ?>
extra_tablenav( $which ); diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index d4348e250b..3acbc0f032 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -298,13 +298,13 @@ class WP_Plugins_List_Table extends WP_List_Table { return $actions; } - public function bulk_actions() { + public function bulk_actions( $which ) { global $status; if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) return; - parent::bulk_actions(); + parent::bulk_actions( $which ); } protected function extra_tablenav( $which ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index c6c748b1ef..1314e37b42 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.0-beta2-20140724'; +$wp_version = '4.0-beta2-20140725'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.