WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use secure.gravatar.com for SSL avatar requests. fixes #8988 for trunk 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-01-29 17:58:16 +00:00
parent d5ca3badae
commit aea6896bf8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/pluggable.php
View File

@ -1508,21 +1508,26 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
$default = $avatar_default; $default = $avatar_default;
} }
if ( is_ssl() )
$host = 'https://secure.gravatar.com';
else
$host = 'http://www.gravatar.com';
if ( 'mystery' == $default ) 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 ) elseif ( 'blank' == $default )
$default = includes_url('images/blank.gif'); $default = includes_url('images/blank.gif');
elseif ( !empty($email) && 'gravatar_default' == $default ) elseif ( !empty($email) && 'gravatar_default' == $default )
$default = ''; $default = '';
elseif ( 'gravatar_default' == $default ) elseif ( 'gravatar_default' == $default )
$default = "http://www.gravatar.com/avatar/s={$size}"; $default = "$host/avatar/s={$size}";
elseif ( empty($email) ) 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 ) elseif ( strpos($default, 'http://') === 0 )
$default = add_query_arg( 's', $size, $default ); $default = add_query_arg( 's', $size, $default );
if ( !empty($email) ) { if ( !empty($email) ) {
$out = 'http://www.gravatar.com/avatar/'; $out = "$host/avatar/";
$out .= md5( strtolower( $email ) ); $out .= md5( strtolower( $email ) );
$out .= '?s='.$size; $out .= '?s='.$size;
$out .= '&d=' . urlencode( $default ); $out .= '&d=' . urlencode( $default );