Ticket #21309: 21309.8.diff

wp-includes/post.php

@@ -377 +377 @@
  * @param string $filter Optional, default is raw.
  * @return mixed Post data or null on failure
  */
-function &get_post( &$post, $output = OBJECT, $filter = 'raw' ) {
-        $null = null;
+function get_post( $post, $output = OBJECT, $filter = 'raw' ) {
+        if ( empty( $post ) && isset( $GLOBALS['post'] ) )
+                $post = $GLOBALS['post'];
 
-        if ( empty( $post ) && isset( $GLOBALS['post'] ) ) {
-                $_post = & $GLOBALS['post'];
-        } elseif ( is_a( $post, 'WP_Post' ) ) {
+        if ( is_a( $post, 'WP_Post' ) ) {
                 $_post = $post;
         } elseif ( is_object( $post ) ) {
                 if ( empty( $post->filter ) ) {
@@ -398 +397 @@
                 $_post = WP_Post::get_instance( $post );
         }
 
-        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;
 }
@@ -3299 +3295 @@
  * @param string $filter How the return value should be filtered.
  * @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 );
 }
 
 /**

wp-includes/query.php

@@ -2750 +2750 @@
                                         // Ignore sticky posts the current user cannot read or are not published.
                                         if ( 'publish' != $sticky_post->post_status )
                                                 continue;
-                                        array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
+                                        array_splice($this->posts, $sticky_offset, 0, array( get_post( $sticky_post ) ) );
                                         $sticky_offset++;
                                 }
                         }