From ceaf87ff2df6bb139e7700599fcac7a3ffa5fde7 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 24 Oct 2013 19:31:06 +0000
Subject: [PATCH] Maintain the same output for get_avatar() as 3.6. see
 [25895].

git-svn-id: https://develop.svn.wordpress.org/trunk@25899 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/pluggable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
index 95046d0437..6839b015ac 100644
--- a/src/wp-includes/pluggable.php
+++ b/src/wp-includes/pluggable.php
@@ -1700,7 +1700,7 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
 		if ( !empty( $rating ) )
 			$out .= "&amp;r={$rating}";
 
-		$out = esc_url( $out );
+		$out = str_replace( '&#038;', '&amp;', esc_url( $out ) );
 		$avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size} photo' height='{$size}' width='{$size}' />";
 	} else {
 		$avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} photo avatar-default' height='{$size}' width='{$size}' />";