Changeset 21572

Timestamp:

08/21/2012 03:42:28 PM (14 years ago)

Author:

ryan

Message:

Remove references from get_post() and get_page().
Handle $GLOBALSpost containing stdClass instead of WP_Post.
Props nacin
see #21309

File:

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

trunk/wp-includes/post.php

@@ -378 +378 @@
  * @return mixed Post data or null on failure
  */
-function &get_post( &$post, $output = OBJECT, $filter = 'raw' ) {
-        $null = null;
-
-        if ( empty( $post ) && isset( $GLOBALS['post'] ) ) {
-                $_post = & $GLOBALS['post'];
-        } elseif ( is_a( $post, 'WP_Post' ) ) {
+function get_post( $post, $output = OBJECT, $filter = 'raw' ) {
+        if ( empty( $post ) && isset( $GLOBALS['post'] ) )
+                $post = $GLOBALS['post'];
+
+        if ( is_a( $post, 'WP_Post' ) ) {
                 $_post = $post;
         } elseif ( is_object( $post ) ) {
@@ -399 +398 @@
         }
 
-        if ( !$_post )
-                return $null;
+        if ( ! $_post )
+                return null;
 
         $_post = $_post->filter( $filter );
 
-        if ( $output == ARRAY_A ) {
-                $__post = $_post->to_array();
-                return $__post;
-        } elseif ( $output == ARRAY_N ) {
-                $__post = array_values( $_post->to_array() );
-                return $__post;
-        }
+        if ( $output == ARRAY_A )
+                return $_post->to_array();
+        elseif ( $output == ARRAY_N )
+                return array_values( $_post->to_array() );
 
         return $_post;
@@ -3300 +3296 @@
  * @return mixed Page data.
  */
-function &get_page(&$page, $output = OBJECT, $filter = 'raw') {
-        $p = get_post($page, $output, $filter);
-        return $p;
+function get_page( $page, $output = OBJECT, $filter = 'raw') {
+        return get_post( $page, $output, $filter );
 }