From 27f4dc5ba4bf605a6cf3537025d45542b332fb83 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 20 Mar 2008 20:19:25 +0000 Subject: [PATCH] Parse default args and return WP_Error for emprt cat name in wp_insert_category. git-svn-id: https://develop.svn.wordpress.org/trunk@7423 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/taxonomy.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php index 66918260e1..b6cd67bd58 100644 --- a/wp-admin/includes/taxonomy.php +++ b/wp-admin/includes/taxonomy.php @@ -52,10 +52,15 @@ function wp_delete_category($cat_ID) { function wp_insert_category($catarr, $wp_error = false) { $cat_defaults = array('cat_ID' => 0, 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => ''); + $cat_arr = wp_parse_args($cat_arr, $cat_defaults); extract($catarr, EXTR_SKIP); - if ( trim( $cat_name ) == '' ) - return 0; + if ( trim( $cat_name ) == '' ) { + if ( ! $wp_error ) + return 0; + else + return new WP_Error( 'cat_name', __('You did not enter a category name.') ); + } $cat_ID = (int) $cat_ID;