Actions
Patch #5929
closedhttps-enabled gravatars when called over https
Start date:
2010-07-21
Due date:
% Done:
100%
Estimated time:
Description
The decision to serve gravatars from the SSL-enabled links or not is currently dependent on the setting protocol in the global configuration, this should be decided per-request depending on whether the request is through SSL or not. This would also stop some browsers (IE, who else?) bickering about some parts of the page being SSL-served and others not.
Index: app/helpers/application_helper.rb
===================================================================
--- app/helpers/application_helper.rb (revision 3839)
+++ app/helpers/application_helper.rb (working copy)
@@ -772,7 +784,7 @@
# +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 => request.ssl?, :default => Setting.gravatar_default})
email = nil
if user.respond_to?(:mail)
email = user.mail
Related issues
Actions