yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #485 from TimoPerplex/7.2.0

Browse Source 
U4-5412: Updated the gravatar url`s to load secure content if needed
This commit is contained in:
Sebastiaan Janssen
2014-09-22 14:16:06 +02:00
parent db0fd1e686 34510e288b
commit 3d9ea6c359
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/common/services/user.service.js
View File

@@ -233,7 +233,7 @@ angular.module('umbraco.services')
}
setCurrentUser(data);
currentUser.avatar = 'http://www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
currentUser.avatar = '//www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
deferred.resolve(currentUser);
});
@@ -251,4 +251,4 @@ angular.module('umbraco.services')
}
};
});
});

4
src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
View File

@@ -90,7 +90,7 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
$timeout(function () {
//this can be null if they time out
if ($scope.user && $scope.user.emailHash) {
$scope.avatar = "http://www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
$scope.avatar = "//www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
}
});
$("#avatar-img").fadeTo(1000, 1);
@@ -105,4 +105,4 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
//register it
angular.module('umbraco').controller("Umbraco.MainController", MainController);
angular.module('umbraco').controller("Umbraco.MainController", MainController);