From: Jean-Philippe Lang Date: Sat, 7 Apr 2018 07:29:25 +0000 (+0000) Subject: Merged r17263 into 3.4-stable (#28208). X-Git-Tag: 3.4.5~8 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b21ec884351f41f3321411fed939fb88578d1fef;p=redmine.git Merged r17263 into 3.4-stable (#28208). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17264 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fd8da95d9..792af987c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1423,11 +1423,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 ''