Changeset 9701

Timestamp:

11/14/2008 11:34:18 PM (18 years ago)

Author:

ryan

Message:

Check proper caps when publising a page. Props DD32. fixes #8208

Location:

trunk/wp-admin

Files:

• edit-page-form.php (modified) (1 diff)
• includes/post.php (modified) (1 diff)

trunk/wp-admin/edit-page-form.php

@@ -229 +229 @@
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?>
-<?php if ( current_user_can('publish_posts') ) : ?>
+<?php if ( $can_publish ) : ?>
         <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
                 <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" />

trunk/wp-admin/includes/post.php

@@ -76 +76 @@
         // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
         // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-        if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( 'publish_posts' )) )
-                if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_pages') )
+        if ( 'page' == $post_data['post_type'] ) {
+                $publish_cap = 'publish_pages';
+                $edit_cap = 'edit_published_pages';
+        } else {
+                $publish_cap = 'publish_posts';
+                $edit_cap = 'edit_published_posts';
+        }
+        if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $publish_cap )) )
+                if ( $previous_status != 'publish' || !current_user_can( $edit_cap ) )
                         $post_data['post_status'] = 'pending';