Changeset 15188

Timestamp:

06/10/2010 02:55:26 PM (13 years ago)

Author:

ryan

Message:

Fix global post stomping in get_post(). Turn get_page() into an alias of get_post(). Props westi. fixes #13753

File:

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

trunk/wp-includes/post.php

@@ -370 +370 @@
     } else {
         if ( is_object($post) )
-            $post = $post->ID;
-        $post = (int) $post;
-        if ( ! $_post = wp_cache_get($post, 'posts') ) {
-            $_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post));
+            $post_id = $post->ID;
+        else
+            $post_id = $post;
+
+        $post_id = (int) $post_id;
+        if ( ! $_post = wp_cache_get($post_id, 'posts') ) {
+            $_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id));
             if ( ! $_post )
                 return $null;
@@ -2866 +2869 @@
  */
 function &get_page(&$page, $output = OBJECT, $filter = 'raw') {
-    if ( empty($page) ) {
-        if ( isset( $GLOBALS['post'] ) && isset( $GLOBALS['post']->ID ) ) {
-            return get_post($GLOBALS['post'], $output, $filter);
-        } else {
-            $page = null;
-            return $page;
-        }
-    }
-
-    $the_page = get_post($page, $output, $filter);
-    return $the_page;
+    return get_post($page, $output, $filter);
 }