Changeset 9110

Timestamp:

10/09/2008 06:40:30 AM (16 years ago)

Author:

azaozz

Message:

Use "Date" instead of "Modified" when listing drafts and pending posts, since now they have a proper date.

File:

• trunk/wp-admin/includes/template.php (modified) (5 diffs)

trunk/wp-admin/includes/template.php

@@ -688 +688 @@
     $posts_columns['cb'] = '<input type="checkbox" />';
     $posts_columns['title'] = __('Title');
-    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['date'] = __('Date');
     $posts_columns['author'] = __('Author');
     $posts_columns['categories'] = __('Categories');
@@ -740 +735 @@
     $posts_columns = array();
     $posts_columns['cb'] = '<input type="checkbox" />';
-
     $posts_columns['title'] = __('Title');
-
-    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['date'] = __('Date');
     $posts_columns['author'] = __('Author');
     if ( !in_array($post_status, array('pending', 'draft', 'future')) )
@@ -927 +914 @@
                 break;
 
-            case 'modified':
             case 'date':
                 if ( ! $bulk ) { ?>
@@ -1258 +1244 @@
         break;
 
-        case 'modified':
         case 'date':
             if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
                 $t_time = $h_time = __('Unpublished');
             } else {
-                if ( 'modified' == $column_name ) {
-                    $t_time = get_the_modified_time(__('Y/m/d g:i:s A'));
-                    $m_time = $post->post_modified;
-                    $time = get_post_modified_time('G', true);
-                } else {
-                    $t_time = get_the_time(__('Y/m/d g:i:s A'));
-                    $m_time = $post->post_date;
-                    $time = get_post_time('G', true);
-                }
+                $t_time = get_the_time(__('Y/m/d g:i:s A'));
+                $m_time = $post->post_date;
+                $time = get_post_time('G', true);
+
                 if ( ( abs(time() - $time) ) < 86400 ) {
                     if ( ( 'future' == $post->post_status) )
@@ -1481 +1461 @@
         <?php
         break;
-    case 'modified':
     case 'date':
         if ( '0000-00-00 00:00:00' == $page->post_date && 'date' == $column_name ) {
             $t_time = $h_time = __('Unpublished');
         } else {
-            if ( 'modified' == $column_name ) {
-                $t_time = get_the_modified_time(__('Y/m/d g:i:s A'));
-                $m_time = $page->post_modified;
-                $time = get_post_modified_time('G', true);
-            } else {
-                $t_time = get_the_time(__('Y/m/d g:i:s A'));
-                $m_time = $page->post_date;
-                $time = get_post_time('G', true);
-            }
+            $t_time = get_the_time(__('Y/m/d g:i:s A'));
+            $m_time = $page->post_date;
+            $time = get_post_time('G', true);
+
             if ( ( abs(time() - $time) ) < 86400 ) {
                 if ( ( 'future' == $page->post_status) )