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

Timestamp:

04/09/2005 05:12:36 PM (20 years ago)

Author:

ryan

Message:

Remove old preview stuff. Allow draft posts to be displayed if the logged in user has edit permissions on the draft. Don't use cruft-free links for drafts since they might not have a slug. ​http://mosquito.wordpress.org/view.php?id=1220

File:

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

trunk/wp-includes/classes.php

@@ -494 +494 @@
 
         if ($this->is_page) {
-            $where .= ' AND (post_status = "static"';
+            $where .= ' AND (post_status = "static")';
+        } elseif ($this->is_single) {
+            $where .= ' AND (post_status != "static")';
         } else {
             $where .= ' AND (post_status = "publish"';
-        }
-
-        // Get private posts
-        if (isset($user_ID) && ('' != intval($user_ID)))
-            $where .= " OR post_author = $user_ID AND post_status != 'draft' AND post_status != 'static')";
-        else
-            $where .= ')';
+
+            if (isset($user_ID) && ('' != intval($user_ID)))
+                $where .= " OR post_author = $user_ID AND post_status != 'draft' AND post_status != 'static')";
+            else
+                $where .= ')';              
+        }
 
         // Apply filters on where and join prior to paging so that any
@@ -544 +545 @@
         $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1".$where." ORDER BY " . $orderby . " $limits";
 
-        if ($q['preview']) {
-            $request = 'SELECT 1-1'; // dummy mysql query for the preview
-            // little funky fix for IEwin, rawk on that code
-            $is_winIE = ((preg_match('/MSIE/',$HTTP_USER_AGENT)) && (preg_match('/Win/',$HTTP_USER_AGENT)));
-            if (($is_winIE) && (!isset($IEWin_bookmarklet_fix))) {
-                $preview_content =  preg_replace('/\%u([0-9A-F]{4,4})/e',  "'&#'.base_convert('\\1',16,10).';'", $preview_content);
-            }
-        }
-
         $this->posts = $wpdb->get_results($request);
+
+        // Check post status to determine if post should be displayed.
+        if ($this->is_single) {
+            if ('publish' != $this->posts[0]->post_status) {
+                if ( ! (isset($user_ID) && ('' != intval($user_ID))) ) {
+                    // User must be logged in to view unpublished posts.
+                    $this->posts = array();
+                } else {
+                    if ('draft' == $this->posts[0]->post_status) {
+                        // User must have edit permissions on the draft to preview.
+                        if (! user_can_edit_post($user_ID, $this->posts[0]->ID))
+                            $this->posts = array();
+                    } elseif ('private' == $this->posts[0]->post_status) {
+                        if ($this->posts[0]->post_author != $user_ID)
+                            $this->posts = array();
+                    }
+                }
+            }
+        }
+
         $this->posts = apply_filters('the_posts', $this->posts);
         $this->post_count = count($this->posts);