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

Timestamp:

05/11/2010 04:28:00 PM (15 years ago)

Author:

ryan

Message:

Don't set/get tags or categories for post types that do not support them. fixes #13346

File:

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

trunk/wp-includes/post.php

@@ -1993 +1993 @@
 
     // Set categories and tags
-    if($mode == OBJECT) {
-        $post->post_category = wp_get_post_categories($postid);
-        $post->tags_input = wp_get_post_tags($postid, array('fields' => 'names'));
-    }
-    else {
-        $post['post_category'] = wp_get_post_categories($postid);
-        $post['tags_input'] = wp_get_post_tags($postid, array('fields' => 'names'));
+    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'));
     }
 
@@ -2241 +2248 @@
     }
 
-    wp_set_post_categories( $post_ID, $post_category );
-    // old-style tags_input
-    if ( isset( $tags_input ) )
+    if ( is_object_in_taxonomy($post_type, 'category') )
+        wp_set_post_categories( $post_ID, $post_category );
+
+    if ( isset( $tags_input ) && is_object_in_taxonomy($post_type, 'post_tag') )
         wp_set_post_tags( $post_ID, $tags_input );