Media Grid: Screen Options for grid have to play nice with Screen Options for list. This was fun.

See #24716.


git-svn-id: https://develop.svn.wordpress.org/trunk@29078 602fd350-edb4-49c9-b593-d223f7449a82

src/wp-admin/includes/screen.php

@@ -1078,7 +1078,13 @@ final class WP_Screen {
 			</div>
 		<?php elseif ( $this->get_option( 'media_grid_title' ) ): ?>
 			<div class="metabox-prefs media-grid-prefs">
-			<?php foreach ( $this->_options as $column => $args ) {
+			<?php
+			$option = get_user_option( 'manageuploadgridcolumnshidden' );
+			$hidden = array();
+			if ( ! empty( $option ) ) {
+				$hidden = $option;
+			}
+			foreach ( $this->_options as $column => $args ) {
 				$id = "$column-hide";
 				echo '<label for="' . $id . '">';
 				$saved = str_replace( 'media_grid_', '', $column );

src/wp-admin/js/common.js

@@ -27,7 +27,7 @@ columns = {
 	},
 
 	saveManageColumnsState : function() {
-		var hidden = this.hidden();
+		var hidden, page;
 		if ( $( '#media_grid_title-hide' ).length ) {
 			hidden = [];
 			$( '.hide-column-tog', '.media-grid-prefs' ).each( function() {
@@ -40,13 +40,18 @@ columns = {
 					$el.removeClass( 'data-hidden' ).addClass( 'data-visible' );
 				}
 			} );
+			page = pagenow + 'grid';
 			hidden = hidden.join( ',' );
+		} else {
+			page = pagenow;
+			hidden = this.hidden();
 		}
+		
 		$.post(ajaxurl, {
 			action: 'hidden-columns',
 			hidden: hidden,
 			screenoptionnonce: $('#screenoptionnonce').val(),
-			page: pagenow
+			page: page
 		});
 	},