| @@ -829,7 +829,7 module ApplicationHelper | |||
|
|
829 | 829 | # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>') |
|
|
830 | 830 | def avatar(user, options = { }) |
|
|
831 | 831 | if Setting.gravatar_enabled? |
|
|
832 |
options.merge!({:ssl => |
|
|
|
832 | options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default}) | |
|
|
833 | 833 | email = nil |
|
|
834 | 834 | if user.respond_to?(:mail) |
|
|
835 | 835 | email = user.mail |
General Comments 0
You need to be logged in to leave comments.
Login now