Ticket #6943: trunk_fix_page_permissions_jun2.diff

wp-admin/includes/post.php

@@ -63 +63 @@
         // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
         if ( 'page' == $_POST['post_type'] ) {
                 if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) )
-                        $_POST['post_status'] = 'pending';
+                        if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_pages') )
+                                $_POST['post_status'] = 'pending';
         } else {
                 if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) ) :
                         // Stop attempts to publish new posts, but allow already published posts to be saved if appropriate.

wp-admin/edit-page-form.php

@@ -78 +78 @@
 </div>
 
 <div class="inside">
-
 <p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
 <select name='post_status' tabindex='4' id='post_status'>
-<?php if ( current_user_can('publish_pages') ) : ?>
+<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages')
+// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown)
+if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) : 
+?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
-<?php else: ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='private'><?php _e('Published') ?></option>
 <?php endif; ?>
 <?php if ( 'future' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
@@ -94 +94 @@
 <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
 </select>
 </p>
+<?php if ( current_user_can( 'publish_posts' ) ) : ?> 
+<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
+<?php endif; ?>
 
-<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
 <?php
 if ($post_ID) {
         if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date