Changes in trunk/wp-admin/admin-ajax.php [15008:15220]

File:

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

trunk/wp-admin/admin-ajax.php

@@ -238 +238 @@
         if ( '' === $category_nicename )
             continue;
-        if ( !($cat_id = is_term($cat_name, $taxonomy->name, $parent)) ) {
+        if ( !($cat_id = term_exists($cat_name, $taxonomy->name, $parent)) ) {
             $new_term = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
             $cat_id = $new_term['term_id'];
@@ -502 +502 @@
         if ( '' === $slug )
             continue;
-        if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
+        if ( !$cat_id = term_exists( $cat_name, 'link_category' ) ) {
             $cat_id = wp_insert_term( $cat_name, 'link_category' );
         }
@@ -575 +575 @@
         $x->send();
     }
+
+    if ( isset($_POST['screen']) )
+        set_current_screen($_POST['screen']);
 
     $level = 0;
@@ -824 +827 @@
         $menu_obj = get_post( $menu_item_id );
         if ( ! empty( $menu_obj->ID ) ) {
-            $menu_items[] = wp_setup_nav_menu_item( $menu_obj );
+            $menu_obj = wp_setup_nav_menu_item( $menu_obj );
+            $menu_obj->label = $menu_obj->title; // don't show "(pending)" in ajax-added items
+            $menu_items[] = $menu_obj;
         }
     }
@@ -832 +837 @@
             'after' => '',
             'before' => '',
-            'context' => 'backend',
             'link_after' => '',
             'link_before' => '',
@@ -1115 +1119 @@
             )
         ));
-        
+
         $markup = ob_get_clean();
-        
+
         echo json_encode(array(
             'replace-id' => $type . '-' . $item->name,