From 6dc400395c07ccd15f9843bc57407c57ca7f6fca Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 23 Sep 2015 04:26:27 +0000
Subject: [PATCH] Links: the `esc_html()` additions in [34444] aren't very nice
 to screen reader `<span>`s. Revert those specific calls.

See #14900.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 8 ++++----
 wp-includes/version.php       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 84b7d69ccd..9d9fc00ad7 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -682,7 +682,7 @@ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
 		$link_text = __('Comments Feed');
 	}
 
-	$link = '<a href="' . esc_url( $url ) . '">' . esc_html( $link_text ) . '</a>';
+	$link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>';
 	/**
 	 * Filter the post comment feed link anchor tag.
 	 *
@@ -1292,7 +1292,7 @@ function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $clas
 		$text = __( 'Edit This' );
 	}
 
-	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . esc_html( $text ) . '</a>';
+	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
 
 	/**
 	 * Filter the post edit link anchor tag.
@@ -1394,7 +1394,7 @@ function edit_comment_link( $text = null, $before = '', $after = '' ) {
 		$text = __( 'Edit This' );
 	}
 
-	$link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . esc_html( $text ) . '</a>';
+	$link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . $text . '</a>';
 
 	/**
 	 * Filter the comment edit link anchor tag.
@@ -1454,7 +1454,7 @@ function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark =
 	if ( empty($link) )
 		$link = __('Edit This');
 
-	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . esc_html( $link ) . '</a>';
+	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
 
 	/**
 	 * Filter the bookmark edit link anchor tag.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 06a8a2dba7..521569017c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34451';
+$wp_version = '4.4-alpha-34452';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.