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

Timestamp:

02/13/2010 05:40:47 AM (17 years ago)

Author:

dd32

Message:

Convert Terms page to use WP_Ajax_Response(), hierarchical terms will now appear under their parent OR have the parents prefixed, Terms will be removed from tag cloud/parent list upon deletion, Terms will be added to Parent list in correct order upon ajax creation, Errors on term creation flow back to UI, clean up _tag_row() alternate class handling, Show None text in Category dropdown if empty and show_if_empty = true. See #11838

File:

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

trunk/wp-admin/admin-ajax.php

@@ -539 +539 @@
         $tax = get_taxonomy($taxonomy);
 
+        $x = new WP_Ajax_Response();
+
         if ( !current_user_can( $tax->edit_cap ) )
                 die('-1');
@@ -545 +547 @@
 
         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;
+                $message = __('An error has occured. Please reload the page and try again.');
+                if ( is_wp_error($tag) && $tag->get_error_message() )
+                        $message = $tag->get_error_message();
+
+                $x->add( array(
+                        'what' => 'taxonomy',
+                        'data' => new WP_Error('error', $message )
+                ) );
+                $x->send();
         }
 
         $level = 0;
         $tag_full_name = false;
+        $tag_full_name = $tag->name;
         if ( is_taxonomy_hierarchical($taxonomy) ) {
-                $tag_full_name = $tag->name;
                 $_tag = $tag;
-                while ( $_tag->parent ) {
+                while ( $_tag->parent  ) {
                         $_tag = get_term( $_tag->parent, $taxonomy );
                         $tag_full_name = $_tag->name . ' &#8212; ' . $tag_full_name;
                         $level++;
                 }
-                $tag_full_name = esc_attr($tag_full_name);
-        }
-        echo _tag_row( $tag, $level, $tag_full_name, $taxonomy );
-        exit;
+        }
+        if ( is_taxonomy_hierarchical($taxonomy) )
+                $noparents = _tag_row( $tag, $level, $taxonomy );
+        $tag->name = $tag_full_name;
+        $parents = _tag_row( $tag, 0, $taxonomy);
+
+        $x->add( array(
+                'what' => 'taxonomy',
+                'supplemental' => compact('parents', 'noparents')
+                ) );
+        $x->add( array(
+                'what' => 'term',
+                'position' => $level,
+                'supplemental' => get_term( $tag->term_id, $taxonomy, ARRAY_A ) //Refetch as $tag has been contaminated by the full name.
+                ) );
+        $x->send();
         break;
 case 'get-tagcloud' :