From 4fe2c2db1e66854d90b9e623bc7ea22dbf8dd2cd Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 24 Oct 2013 19:33:10 +0000
Subject: [PATCH] Maintain the same output for get_avatar() as 3.6. see
 [25896]. For the 3.7 branch.

Built from https://develop.svn.wordpress.org/branches/3.7@25900


git-svn-id: http://core.svn.wordpress.org/branches/3.7@25812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 95046d0437..6839b015ac 100644
--- a/wp-includes/pluggable.php
+++ b/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}' />";