From 06ff26f09271be0cdf8579709c4984530325a4e6 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sun, 2 Aug 2009 04:19:49 +0000
Subject: [PATCH] Enable SSL gravatars when Redmine is using https. (#2718)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2833 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/helpers/application_helper.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 573d49c45..f1b088c4a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -626,6 +626,7 @@ module ApplicationHelper
# +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
def avatar(user, options = { })
if Setting.gravatar_enabled?
+ options.merge!({:ssl => Setting.protocol == 'https'})
email = nil
if user.respond_to?(:mail)
email = user.mail
--
GitLab