diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 04:07:04 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 04:07:04 +0000 |
| commit | 8bd0ff03a08a0980cd3e3a203bd6d4196be6bf51 (patch) | |
| tree | e92435a32e61083b40bf16363544faef4c9a89f1 | |
| parent | 7dbc8b4f971c86aaeab83fc0c8c19bc96c308dbf (diff) | |
| download | redmine-8bd0ff03a08a0980cd3e3a203bd6d4196be6bf51.tar.gz redmine-8bd0ff03a08a0980cd3e3a203bd6d4196be6bf51.zip | |
Merged r4103 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4159 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -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 2ef22c4c6..e825630a9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -824,7 +824,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 |