From 066967be6cc80bec854cacb5aa99ae765d778067 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Fri, 7 Nov 2014 17:38:21 +0000
Subject: [PATCH] Twenty Fifteen: Removing email obfuscation from social links
 menu.

We really should be doing this in all menus, at which point this becomes core or plugin functionality, not a theme feature.

Closes #30214.


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


git-svn-id: http://core.svn.wordpress.org/trunk@30273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/functions.php | 21 -------------------
 wp-includes/version.php                       |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index 691e4e93a8..a5545d833f 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -301,27 +301,6 @@ function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
 }
 add_filter( 'walker_nav_menu_start_el', 'twentyfifteen_nav_description', 10, 4 );
 
-/**
-* Encode email address of mailto: links in social navigation
-*
-* @since Twenty Fifteen 1.0
-*
-* @param array   $atts        HTML attributes in an associative array
-* @param WP_Post $item        Menu item object
-* @param array   $args        Array containing config with desired markup of nav
-*
-* @return array HTML attributes for Menu item
-*/
-function twentyfifteen_nav_encode_email( $atts, $item, $args ) {
-	if ( 'social' == $args->theme_location ) {
-		if ( preg_match( '/^mailto:(.+)/', $atts['href'], $match ) ) {
-			$atts['href'] = 'mailto:' . antispambot( $match[1] );
-		} 
-	}
-	return $atts;
-}
-add_filter( 'nav_menu_link_attributes', 'twentyfifteen_nav_encode_email', 10, 3 );
-
 /**
  * Add a `screen-reader-text` class to the search form's submit button.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 522a026557..172282689c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30272';
+$wp_version = '4.1-alpha-30273';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.