Changeset 6329

Timestamp:

11/12/2007 07:12:49 PM (16 years ago)

Author:

ryan

Message:

Output WP_Error message when adding categories via AJAX. fixes #5342

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• includes/taxonomy.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -200 +200 @@
     }
 
-    if ( !$cat = wp_insert_category( $_POST ) )
-        die('0');
-    if ( !$cat = get_category( $cat ) )
-        die('0');
+    $cat = wp_insert_category( $_POST, true );
+
+    if ( is_wp_error($cat) ) {
+        $x = new WP_Ajax_Response( array(
+            'what' => 'cat',
+            'id' => $cat
+        ) );
+        $x->send();
+    }
+
+    if ( !$cat || (!$cat = get_category( $cat )) )
+        die('0');
+
     $level = 0;
     $cat_full_name = $cat->name;

trunk/wp-admin/includes/taxonomy.php

@@ -53 +53 @@
 }
 
-function wp_insert_category($catarr) {
+function wp_insert_category($catarr, $wp_error = false) {
     global $wpdb;
 
@@ -85 +85 @@
         $cat_ID = wp_insert_term($cat_name, 'category', $args);
 
-    if ( is_wp_error($cat_ID) )
-        return 0;
+    if ( is_wp_error($cat_ID) ) {
+        if ( $wp_error )
+            return $cat_ID;
+        else
+            return 0;
+    }
 
     return $cat_ID['term_id'];