From 6814aefb33549da73019beb3077b593d61e4b404 Mon Sep 17 00:00:00 2001 From: TimoPerplex Date: Mon, 22 Sep 2014 12:21:49 +0200 Subject: [PATCH 1/2] Load gravatar image securely if needed --- src/Umbraco.Web.UI.Client/src/common/services/user.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js index 1a0762a161..df5213afd0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js @@ -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') } }; - }); \ No newline at end of file + }); From 34510e288b859fd0296eaa8ae2b93bd770759e18 Mon Sep 17 00:00:00 2001 From: TimoPerplex Date: Mon, 22 Sep 2014 12:22:35 +0200 Subject: [PATCH 2/2] Load gravatar image securely if needed --- src/Umbraco.Web.UI.Client/src/controllers/main.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js index 5a180ac223..fbbb04f15f 100644 --- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js +++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js @@ -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); \ No newline at end of file +angular.module('umbraco').controller("Umbraco.MainController", MainController);