Commit faaf3f0b authored by jplang's avatar jplang
Browse files

Anonymous user should have their icon (#26699).

Patch by Go MAEDA.

git-svn-id: https://svn.redmine.org/redmine/trunk@17150 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent a0c4fe06
...@@ -1405,7 +1405,13 @@ module ApplicationHelper ...@@ -1405,7 +1405,13 @@ module ApplicationHelper
elsif user.to_s =~ %r{<(.+?)>} elsif user.to_s =~ %r{<(.+?)>}
email = $1 email = $1
end end
return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil if email.present?
gravatar(email.to_s.downcase, options) rescue nil
else
image_tag 'anonymous.png',
GravatarHelper::DEFAULT_OPTIONS
.except(:default, :rating, :ssl).merge(options)
end
else else
'' ''
end end
......
...@@ -1302,6 +1302,7 @@ RAW ...@@ -1302,6 +1302,7 @@ RAW
end end
def test_avatar_enabled def test_avatar_enabled
tag_for_anonymous_re = %r{src="/images/anonymous.png(\?\d+)?"}
with_settings :gravatar_enabled => '1' do with_settings :gravatar_enabled => '1' do
assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo')) assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo')) assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
...@@ -1313,8 +1314,10 @@ RAW ...@@ -1313,8 +1314,10 @@ RAW
# The default class of the img tag should be gravatar # The default class of the img tag should be gravatar
assert avatar('jsmith <jsmith@somenet.foo>').include?('class="gravatar"') assert avatar('jsmith <jsmith@somenet.foo>').include?('class="gravatar"')
assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"') assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"')
assert_nil avatar('jsmith') assert_match tag_for_anonymous_re, avatar('jsmith')
assert_nil avatar(nil) assert_match tag_for_anonymous_re, avatar(nil)
# Avatar for anonymous user
assert_match tag_for_anonymous_re, avatar(User.anonymous)
end end
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment