Ticket #12955: 12955.5.diff

wp-admin/includes/post.php

@@ -618 +618 @@
                 $post->page_template = 'default';
                 $post->post_parent = 0;
                 $post->menu_order = 0;
-                $post = new WP_Post( $post );
+                $post = WP_Post::make_instance( $post );
         }
 
         /**
@@ -1844 +1844 @@
          */
         wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
         exit;
-}
- No newline at end of file
+}

wp-includes/class-wp-post.php

@@ -197 +197 @@
         public $filter;
 
         /**
+         * Flag to disallow "new WP_Post()" to be called w/o deprecation warning.
+         *
+         * @var bool
+         */
+        private static $_allow__construct = false;
+
+        /**
+         * Retrieve virtual WP_Post instance.
+         *
+         * @static
+         * @access public
+         *
+         * @param WP_Post|object|array $post Post value.
+         * @return WP_Post|object Post object.
+         */
+        public static function make_instance( $post ) {
+
+                if ( is_array( $post ) || 'stdClass' === get_class( $post ) ) {
+                        self::$_allow__construct = true;
+                        $post = new WP_Post( (object) $post );
+                        self::$_allow__construct = false;
+                }
+
+                /**
+                 * Filter post object to be sanitized, virtualized and/or have properties annotated.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param WP_Post $post Post object to sanitize/virtualize/annotate/etc.
+                 */
+                return apply_filters( 'make_post_instance', $post );
+
+        }
+
+        /**
          * Retrieve WP_Post instance.
          *
          * @static
@@ -219 +254 @@
                 if ( ! $_post ) {
                         $_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
-                        if ( ! $_post )
-                                return false;
+                        if ( ! $_post ) {
+
+                                /**
+                                 * Retrieve a virtual post instance based on its post_id
+                                 *
+                                 * @since 4.4.0
+                                 *
+                                 * @param null  $_post   Null value returned by failed $wpdb->get_row()
+                                 * @param int   $post_id Virtual post object to retrieve
+                                 */
+                                $_post = apply_filters( 'get_virtual_post_instance', $_post, $post_id );
+
+                                if ( ! $_post ) {
+                                        return false;
+                                }
+                        }
 
                         $_post = sanitize_post( $_post, 'raw' );
                         wp_cache_add( $_post->ID, $_post, 'posts' );
@@ -228 +277 @@
                         $_post = sanitize_post( $_post, 'raw' );
                 }
 
-                return new WP_Post( $_post );
+                return self::make_instance( $_post );
         }
 
         /**
@@ -237 +286 @@
          * @param WP_Post|object $post Post object.
          */
         public function __construct( $post ) {
+
+                if ( ! self::$_allow__construct ) {
+                        _deprecated_function( 'new ' . __CLASS__ . '()', '4.4', 'WP_Post::make_instance()' );
+                }
+
                 foreach ( get_object_vars( $post ) as $key => $value )
                         $this->$key = $value;
         }

wp-includes/post-functions.php

@@ -433 +433 @@
         } elseif ( is_object( $post ) ) {
                 if ( empty( $post->filter ) ) {
                         $_post = sanitize_post( $post, 'raw' );
-                        $_post = new WP_Post( $_post );
+                        $_post = WP_Post::make_instance( $_post );
                 } elseif ( 'raw' == $post->filter ) {
-                        $_post = new WP_Post( $post );
+                        $_post = WP_Post::make_instance( $post );
                 } else {
                         $_post = WP_Post::get_instance( $post->ID );
                 }

wp-admin/includes/media.php

@@ -1187 +1187 @@
         if ( is_int($post) )
                 $post = get_post($post);
         if ( is_array($post) )
-                $post = new WP_Post( (object) $post );
+                $post = WP_Post::make_instance( $post );
 
         $image_url = wp_get_attachment_url($post->ID);
 

wp-includes/class-wp-customize-setting.php

@@ -1348 +1348 @@
 
                 $item->ID = $this->post_id;
                 $item->db_id = $this->post_id;
-                $post = new WP_Post( (object) $item );
+                $post = WP_Post::make_instance( $item );
 
                 if ( empty( $post->post_author ) ) {
                         $post->post_author = get_current_user_id();