From a5b6247297740569a6fa59e7bf81c82c22f6ebc7 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 29 Jan 2009 17:59:03 +0000 Subject: [PATCH] Use secure.gravatar.com for SSL avatar requests. fixes #8988 for 2.7 git-svn-id: http://svn.automattic.com/wordpress/branches/2.7@10462 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pluggable.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index d1233fbdd4cc..7e3f4f13143a 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1529,21 +1529,26 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) { $default = $avatar_default; } + if ( is_ssl() ) + $host = 'https://secure.gravatar.com'; + else + $host = 'http://www.gravatar.com'; + if ( 'mystery' == $default ) - $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') + $default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') elseif ( 'blank' == $default ) $default = includes_url('images/blank.gif'); elseif ( !empty($email) && 'gravatar_default' == $default ) $default = ''; elseif ( 'gravatar_default' == $default ) - $default = "http://www.gravatar.com/avatar/s={$size}"; + $default = "$host/avatar/s={$size}"; elseif ( empty($email) ) - $default = "http://www.gravatar.com/avatar/?d=$default&s={$size}"; + $default = "$host/avatar/?d=$default&s={$size}"; elseif ( strpos($default, 'http://') === 0 ) $default = add_query_arg( 's', $size, $default ); if ( !empty($email) ) { - $out = 'http://www.gravatar.com/avatar/'; + $out = "$host/avatar/"; $out .= md5( strtolower( $email ) ); $out .= '?s='.$size; $out .= '&d=' . urlencode( $default );