From d5cbf00457ab65e24ee0e7ca22e30d5406d0b169 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 10 Jul 2014 21:25:49 +0000
Subject: [PATCH] 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   | 8 +++++++-
 src/wp-admin/js/common.js          | 9 +++++++--
 src/wp-includes/media-template.php | 6 +++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/screen.php b/src/wp-admin/includes/screen.php
index fa3141ab3f..21f16305b4 100644
--- a/src/wp-admin/includes/screen.php
+++ b/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 );
diff --git a/src/wp-admin/js/common.js b/src/wp-admin/js/common.js
index f853493be6..fa76800a1d 100644
--- a/src/wp-admin/js/common.js
+++ b/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
 		});
 	},
 
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 78c899ea66..99d124a107 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -419,7 +419,11 @@ function wp_print_media_templates() {
 		if ( _.contains( data.controller.options.mode, 'grid' ) ) { #>
 		<div class="data-fields">
 		<?php
-		$hidden = get_hidden_columns( get_current_screen() );
+		$option = get_user_option( 'manageuploadgridcolumnshidden' );
+		$hidden = array();
+		if ( ! empty( $option ) ) {
+			$hidden = $option;
+		}
 		$fields = array( 'title', 'uploadedTo', 'dateFormatted', 'mime' );
 		foreach ( $fields as $field ):
 			$class_name = in_array( $field, $hidden ) ? 'data-field data-hidden' : 'data-field data-visible';