Skip to content

Commit

Permalink
Revert [29428] to avoid errors with Add Media for now.
Browse files Browse the repository at this point in the history
See #29026.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
staylor committed Aug 7, 2014
1 parent 6b3251e commit c5dff42
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 37 deletions.
5 changes: 2 additions & 3 deletions wp-admin/includes/class-wp-list-table.php
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ protected function bulk_actions( $which ) {
if ( empty( $this->_actions ) )
return;

echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select Bulk Action' ) . "</label>";
echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";

Expand Down Expand Up @@ -469,8 +469,7 @@ protected function months_dropdown( $post_type ) {

$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
?>
<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
<select name="m" id="filter-by-date">
<select name="m">
<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
<?php
foreach ( $months as $arc_row ) {
Expand Down
3 changes: 1 addition & 2 deletions wp-includes/js/media-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,7 @@
* @augments Backbone.View
*/
media.view.BulkSelectionActionDropdown = media.View.extend({
tagName: 'select',
id: 'bulk-select-dropdown',
tagName: 'select',

initialize: function() {
media.view.Button.prototype.initialize.apply( this, arguments );
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/media-grid.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c5dff42

Please sign in to comment.