Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@13184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-02-17 20:33:29 +00:00
parent 15eee1c4f5
commit 6baf424bf5
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-includes/post.php
View File

@ -2011,12 +2011,19 @@ function wp_insert_post($postarr = array(), $wp_error = false) {
return 0;
}
// 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'));
// '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
// Set the default tag list
if ( !isset($tags_input) )
$tags_input = array();
@ -2026,9 +2033,6 @@ function wp_insert_post($postarr = array(), $wp_error = false) {
if ( empty($post_status) )
$post_status = 'draft';
if ( empty($post_type) )
$post_type = 'post';
$post_ID = 0;
// Get the post ID and GUID
@ -2482,14 +2486,21 @@ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $a
*/
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');
}