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

Timestamp:

02/17/2010 08:33:29 PM (16 years ago)

Author:

ryan

Message:

Don't require a default category for post types other than 'post'. see #9674

File:

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

trunk/wp-includes/post.php

@@ -2012 +2012 @@
         }
 
-        // Make sure we set a valid category
+        if ( empty($post_type) )
+                $post_type = 'post';
+
+        // Make sure we set a valid category.
         if ( empty($post_category) || 0 == count($post_category) || !is_array($post_category) ) {
-                $post_category = array(get_option('default_category'));
-        }
-
-        //Set the default tag list
+                // 'post' requires at least one category.
+                if ( 'post' == $post_type )
+                        $post_category = array( get_option('default_category') );
+                else
+                        $post_category = array();
+        }
+
+        // Set the default tag list
         if ( !isset($tags_input) )
                 $tags_input = array();
@@ -2026 +2033 @@
         if ( empty($post_status) )
                 $post_status = 'draft';
-
-        if ( empty($post_type) )
-                $post_type = 'post';
 
         $post_ID = 0;
@@ -2483 +2487 @@
 function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
         $post_ID = (int) $post_ID;
+        $post_type = get_post_type( $post_ID );
         // If $post_categories isn't already an array, make it one:
-        if (!is_array($post_categories) || 0 == count($post_categories) || empty($post_categories))
-                $post_categories = array(get_option('default_category'));
-        else if ( 1 == count($post_categories) && '' == $post_categories[0] )
+        if ( !is_array($post_categories) || 0 == count($post_categories) || empty($post_categories) ) {
+                if ( 'post' == $post_type )
+                        $post_categories = array( get_option('default_category') );
+                else
+                        $post_categories = array();
+        } else if ( 1 == count($post_categories) && '' == $post_categories[0] ) {
                 return true;
-
-        $post_categories = array_map('intval', $post_categories);
-        $post_categories = array_unique($post_categories);
+        }
+
+        if ( !empty($post_categories) ) {
+                $post_categories = array_map('intval', $post_categories);
+                $post_categories = array_unique($post_categories);
+        }
 
         return wp_set_object_terms($post_ID, $post_categories, 'category');