From 574be8f2a8e7551b65f2646fdff94655c3e7d904 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 10 May 2016 06:41:29 +0000
Subject: [PATCH] Customize: Ensure that `wp_setup_nav_menu_item` filter
 applies consistently on `nav_menu_item` setting values.

The filter was being applied in `WP_Customize_Nav_Menu_Item_Setting::value()` but not in `WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item()`.

Props celloexpressions, westonruter.
Fixes #35203.

Built from https://develop.svn.wordpress.org/trunk@37405


git-svn-id: http://core.svn.wordpress.org/trunk@37371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../customize/class-wp-customize-nav-menu-item-setting.php     | 3 +++
 wp-includes/version.php                                        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
index 0bbee67e2f..3aecaa24a2 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
@@ -570,6 +570,9 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 		/** This filter is documented in wp-includes/nav-menu.php */
 		$post->description = apply_filters( 'nav_menu_description', wp_trim_words( $post->description, 200 ) );
 
+		/** This filter is documented in wp-includes/nav-menu.php */
+		$post = apply_filters( 'wp_setup_nav_menu_item', $post );
+
 		return $post;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f865bc4f3f..c12c188e10 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37404';
+$wp_version = '4.6-alpha-37405';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.