Changeset 20072

Timestamp:

03/02/2012 05:50:01 PM (14 years ago)

Author:

nacin

Message:

Add the wp_edit_nav_menu_walker filter to the ajax request. props wonderslug, ocean90. fixes #14527.

File:

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

trunk/wp-admin/includes/ajax-actions.php

@@ -158 +158 @@
                 wp_die( -1 );
         }
-        
+
         $return = array();
 
@@ -174 +174 @@
                 'exclude' => $this_blog_users,
                 'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
-        ) );    
+        ) );
 
         foreach ( $users as $user ) {
@@ -805 +805 @@
 
 function wp_ajax_add_menu_item() {
+        check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
+
         if ( ! current_user_can( 'edit_theme_options' ) )
                 wp_die( -1 );
-
-        check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
 
         require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
@@ -844 +844 @@
         $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
         if ( is_wp_error( $item_ids ) )
-                wp_die( -1 );
+                wp_die( 0 );
 
         $menu_items = array();
@@ -857 +857 @@
         }
 
+        $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] );
+
+        if ( ! class_exists( $walker_class_name ) )
+                wp_die( 0 );
+
         if ( ! empty( $menu_items ) ) {
                 $args = array(
@@ -863 +868 @@
                         'link_after' => '',
                         'link_before' => '',
-                        'walker' => new Walker_Nav_Menu_Edit,
+                        'walker' => new $walker_class_name,
                 );
                 echo walk_nav_menu_tree( $menu_items, 0, (object) $args );