If category already exists, return its ID. Restores previous behavior. fixes #14067 for 3.1

git-svn-id: http://svn.automattic.com/wordpress/trunk@15425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-07-14 14:12:23 +00:00
parent a8af962f88
commit 900c2e22d4
2 changed files with 12 additions and 6 deletions

View File

@@ -933,9 +933,15 @@ class wp_xmlrpc_server extends IXR_Server {
"category_description" => $category["description"]
);
$cat_id = wp_insert_category($new_category);
if ( !$cat_id )
$cat_id = wp_insert_category($new_category, true);
if ( is_wp_error( $cat_id ) ) {
if ( 'term_exists' == $cat_id->get_error_code() )
return (int) $cat_id->get_error_data();
else
return(new IXR_Error(500, __("Sorry, the new category failed.")));
} elseif ( ! $cat_id ) {
return(new IXR_Error(500, __("Sorry, the new category failed.")));
}
return($cat_id);
}