diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-08-02 04:19:49 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-08-02 04:19:49 +0000 |
| commit | 06ff26f09271be0cdf8579709c4984530325a4e6 (patch) | |
| tree | 0e1064f843241003df278069c825437c0bee150b /app/helpers | |
| parent | 560e915c50e80a7ee0527ac59b4e31ad53adab31 (diff) | |
| download | redmine-06ff26f09271be0cdf8579709c4984530325a4e6.tar.gz redmine-06ff26f09271be0cdf8579709c4984530325a4e6.zip | |
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
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |