TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-05 18:34:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4775 from Trendy/gravatar_error

Browse Source 
Fixed issue where Gravatars with rating higher than G would cause a 404 ...
This commit is contained in:
Jason Williams 2015-01-09 11:05:14 -06:00
commit 95aad12de1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/server/models/user.js
View File

@ -876,20 +876,21 @@ User = ghostBookshelf.Model.extend({
gravatarLookup: function (userData) {
var gravatarUrl = '//www.gravatar.com/avatar/' +
crypto.createHash('md5').update(userData.email.toLowerCase().trim()).digest('hex') +
'?d=404&s=250';
'?s=250';
return new Promise(function (resolve) {
if (config.isPrivacyDisabled('useGravatar')) {
return resolve(userData);
}
request({url: 'http:' + gravatarUrl, timeout: 2000}, function (err, response) {
request({url: 'http:' + gravatarUrl + '&d=404&r=x', timeout: 2000}, function (err, response) {
if (err) {
// just resolve with no image url
return resolve(userData);
}
if (response.statusCode !== 404) {
gravatarUrl += '&d=mm&r=x';
userData.image = gravatarUrl;
}