Changeset 11873

Timestamp:

08/24/2009 08:48:31 PM (17 years ago)

Author:

azaozz

Message:

Don't let contributors to re-publish their trashed posts, props caesarsgrunt, see #4529

File:

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

trunk/wp-includes/capabilities.php

@@ -774 +774 @@
                 if ( $user_id == $post_author_data->ID ) {
                         // If the post is published...
-                        if ( 'publish' == $post->post_status )
+                        if ( 'publish' == $post->post_status ) {
                                 $caps[] = 'delete_published_posts';
-                        else
+                        } elseif ( 'trash' == $post->post_status ) {
+                                $trash_meta = get_option('wp_trash_meta');
+                                if (is_array($trash_meta) && isset($trash_meta['posts'][$post->ID]['status']) && $trash_meta['posts'][$post->ID]['status'] == 'publish')
+                                        $caps[] = 'delete_published_posts';
+                        } else {
                                 // If the post is draft...
                                 $caps[] = 'delete_posts';
+                        }
                 } else {
                         // The user is trying to edit someone else's post.
@@ -798 +803 @@
                 if ( $user_id == $page_author_data->ID ) {
                         // If the page is published...
-                        if ( $page->post_status == 'publish' )
+                        if ( $page->post_status == 'publish' ) {
                                 $caps[] = 'delete_published_pages';
-                        else
+                        } elseif ( 'trash' == $page->post_status ) {
+                                $trash_meta = get_option('wp_trash_meta');
+                                if (is_array($trash_meta) && isset($trash_meta['posts'][$page->ID]['status']) && $trash_meta['posts'][$page->ID]['status'] == 'publish')
+                                        $caps[] = 'delete_published_pages';
+                        } else {
                                 // If the page is draft...
                                 $caps[] = 'delete_pages';
+                        }
                 } else {
                         // The user is trying to edit someone else's page.