Changeset 12332

Timestamp:

12/07/2009 06:01:02 PM (16 years ago)

Author:

westi

Message:

Check the correct global in get_page and also ensure that the cap check for deleting pages copes for the default page we edit when adding new. Fixes #11203.

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -819 +819 @@
         //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />";
         // If the user is the author...
+
+        if ('' != $page->post_author) {
+            $page_author_data = get_userdata( $page->post_author );
+        } else {
+            //No author set yet so default to current user for cap checks
+            $page_author_data = $author_data;
+        }
+
         if ( $user_id == $page_author_data->ID ) {
             // If the page is published...

trunk/wp-includes/post.php

@@ -2280 +2280 @@
 function &get_page(&$page, $output = OBJECT, $filter = 'raw') {
     if ( empty($page) ) {
-        if ( isset( $GLOBALS['page'] ) && isset( $GLOBALS['page']->ID ) ) {
-            return get_post($GLOBALS['page'], $output, $filter);
+        if ( isset( $GLOBALS['post'] ) && isset( $GLOBALS['post']->ID ) ) {
+            return get_post($GLOBALS['post'], $output, $filter);
         } else {
             $page = null;