diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 02:55:14 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 02:55:14 +0000 |
| commit | 09331ec432bc0b3b308ecd4f44e39dcccf670eb7 (patch) | |
| tree | b3aebeb5d4f74e2cb1eb0e280ee0df67463705d0 /app | |
| parent | 944d1a68bd23b722e84243fda7eda0e4a0a23459 (diff) | |
| download | redmine-09331ec432bc0b3b308ecd4f44e39dcccf670eb7.tar.gz redmine-09331ec432bc0b3b308ecd4f44e39dcccf670eb7.zip | |
Turn on ssl Gravatars for all SSL requests. #5929
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4103 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index eecbc5b91..6ba40eb45 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -829,7 +829,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', :default => Setting.gravatar_default}) + options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default}) email = nil if user.respond_to?(:mail) email = user.mail |