Changeset 3772

Timestamp:

05/11/2006 11:13:35 PM (19 years ago)

Author:

ryan

Message:

Remove private posts from front page query. Aadd private posts and page caps. fixes #2613

Location:

trunk

Files:

• wp-admin/upgrade-functions.php (modified) (2 diffs)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (4 diffs)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/upgrade-functions.php

@@ -174 +174 @@
         upgrade_160();
 
-    if ( $wp_current_db_version < 3672 )
+    if ( $wp_current_db_version < 3767 )
         upgrade_210();
 
@@ -493 +493 @@
     }
 
-    if ( $wp_current_db_version < 3513 ) {
+    if ( $wp_current_db_version < 3767 ) {
         populate_roles_210();
     }

trunk/wp-admin/upgrade-schema.php

@@ -353 +353 @@
         $role->add_cap('delete_others_posts');
         $role->add_cap('delete_published_posts');
+        $role->add_cap('delete_private_posts');
+        $role->add_cap('edit_private_posts');
+        $role->add_cap('read_private_posts');
+        $role->add_cap('delete_private_pages');
+        $role->add_cap('edit_private_pages');
+        $role->add_cap('read_private_pages');
     }
 

trunk/wp-includes/capabilities.php

@@ -297 +297 @@
             if ($post->post_status == 'publish')
                 $caps[] = 'delete_published_posts';
+            else if ($post->post_status == 'private')
+                $caps[] = 'delete_private_posts';
         }
         break;
@@ -319 +321 @@
             if ($page->post_status == 'publish')
                 $caps[] = 'delete_published_pages';
+            else if ($page->post_status == 'private')
+                $caps[] = 'delete_private_pages';
         }
         break;
@@ -347 +351 @@
             if ($post->post_status == 'publish')
                 $caps[] = 'edit_published_posts';
+            else if ($post->post_status == 'private')
+                $caps[] = 'edit_private_posts';
         }
         break;
@@ -369 +375 @@
             if ($page->post_status == 'publish')
                 $caps[] = 'edit_published_pages';
+            else if ($page->post_status == 'private')
+                $caps[] = 'edit_private_pages';
         }
         break;

trunk/wp-includes/query.php

@@ -829 +829 @@
             $where .= " AND (post_type = '$post_type' AND (post_status = 'publish'";
 
-            if ( is_admin() )
+            if ( is_admin() ) {
                 $where .= " OR post_status = 'future' OR post_status = 'draft'";
     
-            if ( is_user_logged_in() )
-                $where .= " OR post_author = $user_ID AND post_status = 'private'))";
-            else
-                $where .= '))';
+                if ( is_user_logged_in() ) {
+                    if ( 'post' == $post_type )
+                        $cap = 'edit_private_posts';
+                    else
+                        $cap = 'edit_private_pages';
+
+                    if ( current_user_can($cap) )
+                        $where .= "OR post_status = 'private'";
+                    else
+                    $where .= " OR post_author = $user_ID AND post_status = 'private'";
+                }
+            }
+
+            $where .= '))';
         }
 

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.1-alpha1';
-$wp_db_version = 3672;
+$wp_db_version = 3767;
 
 ?>