Changeset 11676 for trunk/wp-admin/admin-ajax.php

Timestamp:

07/01/2009 08:12:39 AM (15 years ago)

Author:

azaozz

Message:

Use new jQuery methods when adding, editing and deleting tags with AJAX, fix warning when deleting tags, see #10239

File:

• trunk/wp-admin/admin-ajax.php (modified) (4 diffs)

trunk/wp-admin/admin-ajax.php

@@ -214 +214 @@
     break;
 case 'delete-tag' :
-    check_ajax_referer( "delete-tag_$id" );
+    $tag_id = (int) $_POST['tag_ID'];
+    check_ajax_referer( "delete-tag_$tag_id" );
     if ( !current_user_can( 'manage_categories' ) )
         die('-1');
 
-    if ( !empty($_POST['taxonomy']) )
-        $taxonomy = $_POST['taxonomy'];
-    else
-        $taxonomy = 'post_tag';
-
-    $tag = get_term( $id, $taxonomy );
+    $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+
+    $tag = get_term( $tag_id, $taxonomy );
     if ( !$tag || is_wp_error( $tag ) )
         die('1');
 
-    if ( wp_delete_term($id, $taxonomy))
+    if ( wp_delete_term($tag_id, $taxonomy))
         die('1');
     else
@@ -528 +526 @@
         die('-1');
 
-    if ( '' === trim($_POST['name']) ) {
-        $x = new WP_Ajax_Response( array(
-            'what' => 'tag',
-            'id' => new WP_Error( 'name', __('You did not enter a tag name.') )
-        ) );
-        $x->send();
-    }
-
-    if ( !empty($_POST['taxonomy']) )
-        $taxonomy = $_POST['taxonomy'];
-    else
-        $taxonomy = 'post_tag';
-
-    $tag = wp_insert_term($_POST['name'], $taxonomy, $_POST );
-
-    if ( is_wp_error($tag) ) {
-        $x = new WP_Ajax_Response( array(
-            'what' => 'tag',
-            'id' => $tag
-        ) );
-        $x->send();
-    }
-
-    if ( !$tag || (!$tag = get_term( $tag['term_id'], $taxonomy )) )
-        die('0');
-
-    $tag_full_name = $tag->name;
-    $tag_full_name = esc_attr($tag_full_name);
-
-    $x = new WP_Ajax_Response( array(
-        'what' => 'tag',
-        'id' => $tag->term_id,
-        'position' => '-1',
-        'data' => _tag_row( $tag, '', $taxonomy ),
-        'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name))
-    ) );
-    $x->send();
+    $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+    $tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
+
+    if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
+        echo '<div class="error"><p>' . __('An error has occured. Please reload the page and try again.') . '</p></div>';
+        exit;
+    }
+
+    echo _tag_row( $tag, '', $taxonomy );
+    exit;
     break;
 case 'get-tagcloud' :
@@ -1149 +1120 @@
             break;
         case 'tag' :
-            if ( !empty($_POST['taxonomy']) )
-                $taxonomy = $_POST['taxonomy'];
-            else
-                $taxonomy = 'post_tag';
+            $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 
             $tag = get_term( $id, $taxonomy );
@@ -1163 +1131 @@
                     die( __('Tag not updated.') );
 
-                echo _tag_row($tag);
+                echo _tag_row($tag, '', $taxonomy);
             } else {
                 die( __('Tag not updated.') );