summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2018-04-07 07:30:20 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2018-04-07 07:30:20 +0000
commitb683b195a102e9e5c9fadc8f8781c5edab6f2eb9 (patch)
tree93fad5830300d814482197453e5bda688a3aa2f6
parenteee0b929a35f2f42b20db8569ca55a3a4a301524 (diff)
downloadredmine-b683b195a102e9e5c9fadc8f8781c5edab6f2eb9.tar.gz
redmine-b683b195a102e9e5c9fadc8f8781c5edab6f2eb9.zip
Merged r17263 into 3.3-stable (#28208).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17265 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/application_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2b8054934..76b789b45 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1280,11 +1280,13 @@ module ApplicationHelper
end
if email.present?
gravatar(email.to_s.downcase, options) rescue nil
- else
+ elsif user.is_a?(AnonymousUser)
options[:size] &&= options[:size].to_s
image_tag 'anonymous.png',
GravatarHelper::DEFAULT_OPTIONS
.except(:default, :rating, :ssl).merge(options)
+ else
+ nil
end
else
''