Changeset 3514 for trunk/wp-includes/classes.php

Timestamp:

02/12/2006 07:41:56 AM (21 years ago)

Author:

ryan

Message:

Post status = future. #2426

File:

• trunk/wp-includes/classes.php (modified) (4 diffs)

trunk/wp-includes/classes.php

@@ -572 +572 @@
                 }
 
-                $now = gmdate('Y-m-d H:i:59');
+                //$now = gmdate('Y-m-d H:i:59');
                 
                 //only select past-dated posts, except if a logged in user is viewing a single: then, if they
                 //can edit the post, we let them through
-                if ($pagenow != 'post.php' && $pagenow != 'edit.php' && !($this->is_single && $user_ID)) {
-                        $where .= " AND post_date_gmt <= '$now'";
-                        $distinct = 'DISTINCT';
-                }
+                //if ($pagenow != 'post.php' && $pagenow != 'edit.php' && !($this->is_single && $user_ID)) {
+                //      $where .= " AND post_date_gmt <= '$now'";
+                //      $distinct = 'DISTINCT';
+                //}
 
                 if ( $this->is_attachment ) {
@@ -590 +590 @@
                         $where .= ' AND (post_type = "post" AND post_status = "publish"';
 
-                        if (isset($user_ID) && ('' != intval($user_ID)))
+                        if ( $pagenow == 'post.php' || $pagenow == 'edit.php' )
+                                $where .= " OR post_status = 'future'";
+                        else
+                                $distinct = 'DISTINCT';
+        
+                        if ( is_user_logged_in() )
                                 $where .= " OR post_author = $user_ID AND post_status = 'private')";
                         else
@@ -642 +647 @@
                 if ($this->is_single || $this->is_page) {
                         $status = get_post_status($this->posts[0]);
+                        //$type = get_post_type($this->posts[0]);
                         if ( ('publish' != $status) ) {
                                 if ( ! is_user_logged_in() ) {
@@ -655 +661 @@
                                                         $this->posts[0]->post_date = current_time('mysql');
                                                 }
+                                        }  else if ('future' == $status) {
+                                                $this->is_preview = true;
+                                                if (!current_user_can('edit_post', $this->posts[0]->ID)) {
+                                                        $this->posts = array ( );
+                                                }
                                         } else {
                                                 if (! current_user_can('read_post', $this->posts[0]->ID))
                                                         $this->posts = array();
-                                        }
-                                }
-                        } else {
-                                if (mysql2date('U', $this->posts[0]->post_date_gmt) > mysql2date('U', $now)) { //it's future dated
-                                        $this->is_preview = true;
-                                        if (!current_user_can('edit_post', $this->posts[0]->ID)) {
-                                                $this->posts = array ( );
                                         }
                                 }