Changeset 2523

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

Location:

trunk

Files:

• wp-blog-header.php (modified) (2 diffs)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/functions-post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/template-functions-links.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -86 +86 @@
  }
 
-$wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup');
+$wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence', 'debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup');
 
 $wpvarstoreset = apply_filters('query_vars', $wpvarstoreset);
@@ -168 +168 @@
 
 update_category_cache();
+get_currentuserinfo();
 
 // Call query posts to do the work.

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);

trunk/wp-includes/functions-post.php

@@ -352 +352 @@
 function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
     $author_data = get_userdata($user_id);
-    $post_data   = get_postdata($post_id);
-    $post_author_data = get_userdata($post_data['Author_ID']);
-
-    if ( (($user_id == $post_author_data->ID) && !($post_data['post_status'] == 'publish' &&  $author_data->user_level < 2))
+    $post = get_post($post_id);
+    $post_author_data = get_userdata($post->post_author);
+
+    if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))
          || ($author_data->user_level > $post_author_data->user_level)
          || ($author_data->user_level >= 10) ) {

trunk/wp-includes/functions.php

@@ -857 +857 @@
 // Setup global post data.
 function setup_postdata($post) {
-  global $id, $postdata, $authordata, $day, $preview, $page, $pages, $multipage, $more, $numpages, $wp_query;
+  global $id, $postdata, $authordata, $day, $page, $pages, $multipage, $more, $numpages, $wp_query;
     global $pagenow;
 
-    if (!$preview) {
-        $id = $post->ID;
-    } else {
-        $id = 0;
-        $postdata = array (
-            'ID' => 0,
-            'Author_ID' => $_GET['preview_userid'],
-            'Date' => $_GET['preview_date'],
-            'Content' => $_GET['preview_content'],
-            'Excerpt' => $_GET['preview_excerpt'],
-            'Title' => $_GET['preview_title'],
-            'Category' => $_GET['preview_category'],
-            'Notify' => 1
-            );
-    }
+    $id = $post->ID;
+
     $authordata = get_userdata($post->post_author);
 
@@ -1159 +1146 @@
     FROM $wpdb->posts
     LEFT JOIN $wpdb->comments ON ( comment_post_ID = ID  AND comment_approved =  '1')
-    WHERE post_status =  'publish' AND ID IN ($post_id_list)
+    WHERE ID IN ($post_id_list)
     GROUP BY ID");
     

trunk/wp-includes/template-functions-links.php

@@ -45 +45 @@
     $permalink = get_settings('permalink_structure');
 
-    if ('' != $permalink) {
+    if ('' != $permalink && 'draft' != $post->post_status) {
         $unixtime = strtotime($post->post_date);