Changeset 21651 for trunk/wp-includes/post.php

Timestamp:

08/28/2012 07:08:28 PM (12 years ago)

Author:

ryan

Message:

Add tags_input, page_template, and post_category get magic to WP_Post.
Deprecate get_post_to_edit() and wp_get_single_post().
Props scribu
see #21309

File:

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

trunk/wp-includes/post.php

@@ -476 +476 @@
             return true;
 
+        if ( 'page_template' == $key )
+            return ( 'page' == $this->post_type );
+
+        if ( 'post_category' == $key )
+           return true;
+
+        if ( 'tags_input' == $key )
+           return true;
+
         return metadata_exists( 'post', $this->ID, $key );
     }
 
     public function &__get( $key ) {
+        if ( 'page_template' == $key && $this->__isset( $key ) ) {
+            $_ref = get_post_meta( $this->ID, '_wp_page_template', true );
+        }
+
+        if ( 'post_category' == $key ) {
+            if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) {
+                $_ref = wp_get_post_categories( $this->ID );
+            } else {
+                $_ref = array();
+            }
+        }
+
+        if ( 'tags_input' == $key ) {
+            if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) {
+                $_ref = wp_get_post_tags( $this->ID, array( 'fields' => 'names' ) );
+            } else {
+                $_ref = array();
+            }
+        }
+
+        if ( isset( $_ref ) )
+            return $_ref;
+
+        // Rest of the values need filtering
+
         if ( 'ancestors' == $key ) {
             $value = get_post_ancestors( $this );
@@ -505 +539 @@
     public function to_array() {
         $post = get_object_vars( $this );
-        $post['ancestors'] = array();
+
+        foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
+            if ( $this->__isset( $key ) )
+                $post[ $key ] = $this->__get( $key );
+        }
 
         return $post;
@@ -2227 +2265 @@
         return wp_delete_post($post_id, true);
 
-    if ( !$post = wp_get_single_post($post_id, ARRAY_A) )
+    if ( !$post = get_post($post_id, ARRAY_A) )
         return $post;
 
@@ -2259 +2297 @@
  */
 function wp_untrash_post($post_id = 0) {
-    if ( !$post = wp_get_single_post($post_id, ARRAY_A) )
+    if ( !$post = get_post($post_id, ARRAY_A) )
         return $post;
 
@@ -2487 +2525 @@
     return $results ? $results : false;
 
-}
-
-/**
- * Retrieve a single post, based on post ID.
- *
- * Has categories in 'post_category' property or key. Has tags in 'tags_input'
- * property or key.
- *
- * @since 1.0.0
- *
- * @param int $postid Post ID.
- * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
- * @return WP_Post|array WP_Post object or array holding post contents and information
- */
-function wp_get_single_post($postid = 0, $mode = OBJECT) {
-    $postid = (int) $postid;
-
-    $post = get_post($postid, $mode);
-
-    if (
-        ( OBJECT == $mode && empty( $post->ID ) ) ||
-        ( OBJECT != $mode && empty( $post['ID'] ) )
-    )
-        return ( OBJECT == $mode ? null : array() );
-
-    // Set categories and tags
-    if ( $mode == OBJECT ) {
-        $post->post_category = array();
-        if ( is_object_in_taxonomy($post->post_type, 'category') )
-            $post->post_category = wp_get_post_categories($postid);
-        $post->tags_input = array();
-        if ( is_object_in_taxonomy($post->post_type, 'post_tag') )
-            $post->tags_input = wp_get_post_tags($postid, array('fields' => 'names'));
-    } else {
-        $post['post_category'] = array();
-        if ( is_object_in_taxonomy($post['post_type'], 'category') )
-            $post['post_category'] = wp_get_post_categories($postid);
-        $post['tags_input'] = array();
-        if ( is_object_in_taxonomy($post['post_type'], 'post_tag') )
-            $post['tags_input'] = wp_get_post_tags($postid, array('fields' => 'names'));
-    }
-
-    return $post;
 }
 
@@ -2833 +2828 @@
 
     // First, get all of the original fields
-    $post = wp_get_single_post($postarr['ID'], ARRAY_A);
+    $post = get_post($postarr['ID'], ARRAY_A);
 
     // Escape data pulled from DB.
@@ -3242 +3237 @@
     if ( ! empty( $tb_list ) ) {
         // get post data
-        $postdata = wp_get_single_post($post_id, ARRAY_A);
+        $postdata = get_post($post_id, ARRAY_A);
 
         // import postdata as variables