From 2d6aad8d621dbb56f3d0f3deb3a114b08b099e85 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Thu, 9 Oct 2008 05:58:10 +0000
Subject: [PATCH] Page Options: fix hiding of Modified column when listing
 drafts, props ShaneF, fixes #7855

git-svn-id: https://develop.svn.wordpress.org/trunk@9109 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/template.php | 23 ++++++-----------------
 wp-admin/wp-admin.css          | 12 ++++++++----
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index da9ac413dd..7f7cb96289 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -742,18 +742,12 @@ function wp_manage_pages_columns() {
 
 	$posts_columns['title'] = __('Title');
 
-	$post_status = isset( $_GET['post_status'] ) ? $_GET['post_status'] : '';
-
-	switch( $post_status ) {
-		case 'draft':
-			$posts_columns['modified'] = __('Modified');
-			break;
-		case 'pending':
-			$posts_columns['modified'] = __('Submitted');
-			break;
-		default:
-			$posts_columns['date'] = __('Date');
-	}
+	if ( isset($_GET['post_status']) && 'draft' === $_GET['post_status'] )
+		$posts_columns['modified'] = __('Modified');
+	elseif ( isset($_GET['post_status']) && 'pending' === $_GET['post_status'] )
+		$posts_columns['modified'] = __('Submitted');
+	else
+		$posts_columns['date'] = __('Date');
 
 	$posts_columns['author'] = __('Author');
 	if ( !in_array($post_status, array('pending', 'draft', 'future')) )
@@ -866,9 +860,6 @@ function print_column_headers( $type, $id = true ) {
 	foreach ( $columns as $column_key => $column_display_name ) {
 		$class = ' class="manage-column';
 
-		if ( 'modified' == $column_key )
-			$column_key = 'date';
-
 		$class .= " column-$column_key";
 
 		if ( 'cb' == $column_key )
@@ -1268,7 +1259,6 @@ function _post_row($a_post, $pending_comments, $mode) {
 
 		case 'modified':
 		case 'date':
-			$attributes = 'class="date column-date"' . $style;
 			if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
 				$t_time = $h_time = __('Unpublished');
 			} else {
@@ -1492,7 +1482,6 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
 		break;
 	case 'modified':
 	case 'date':
-		$attributes = 'class="date column-date"' . $style;
 		if ( '0000-00-00 00:00:00' == $page->post_date && 'date' == $column_name ) {
 			$t_time = $h_time = __('Unpublished');
 		} else {
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 8ed293c401..0fe3387d5a 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -2222,21 +2222,25 @@ a.togbox {
 	margin: 3px 0 0;
 }
 
-.inline-editor .date {
+.inline-editor .date,
+.inline-editor .modified {
 	width: 160px;
 }
 
-.inline-editor .date input {
+.inline-editor .date input,
+.inline-editor .modified input {
 	padding: 2px 1px;
 	margin: 1px;
 	width: 18px;
 }
 
-.inline-editor .date input[name="aa"] {
+.inline-editor .date input[name="aa"],
+.inline-editor .modified input[name="aa"] {
 	width: 30px;
 }
 
-#wpbody-content .inline-editor .date select {
+#wpbody-content .inline-editor .date select,
+#wpbody-content .inline-editor .modified select {
 	width: 80px;
 }