From 66dc1e25a1ed18d49e11cc1a797e3cc8008ee05a Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 24 Oct 2013 18:54:08 +0000
Subject: [PATCH] Always escape URLs at the last possible moment. for the 3.7
 branch.

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


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

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index d75908261e..95046d0437 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1700,6 +1700,7 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
 		if ( !empty( $rating ) )
 			$out .= "&amp;r={$rating}";
 
+		$out = 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}' />";
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 851d275070..36710350f4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.7-RC2-25892';
+$wp_version = '3.7-RC2-25896';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.