From a147fd1d0b25c4131837cfe5baafaf85cd2a4929 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 2 Mar 2012 17:50:01 +0000
Subject: [PATCH] Add the wp_edit_nav_menu_walker filter to the ajax request.
 props wonderslug, ocean90. fixes #14527.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ajax-actions.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index beadd8bf81..93d1b4a848 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -157,7 +157,7 @@ function wp_ajax_autocomplete_user() {
 	) {
 		wp_die( -1 );
 	}
-	
+
 	$return = array();
 
 	// Exclude current users of this blog
@@ -173,7 +173,7 @@ function wp_ajax_autocomplete_user() {
 		'search'  => '*' . $_REQUEST['term'] . '*',
 		'exclude' => $this_blog_users,
 		'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
-	) );	
+	) );
 
 	foreach ( $users as $user ) {
 		$return[] = array(
@@ -804,11 +804,11 @@ function wp_ajax_edit_comment() {
 }
 
 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';
 
 	// For performance reasons, we omit some object properties from the checklist.
@@ -843,7 +843,7 @@ function wp_ajax_add_menu_item() {
 
 	$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();
 
@@ -856,13 +856,18 @@ function wp_ajax_add_menu_item() {
 		}
 	}
 
+	$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(
 			'after' => '',
 			'before' => '',
 			'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 );
 	}