summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-05-22 08:13:22 +0000
committerGo MAEDA <maeda@farend.jp>2019-05-22 08:13:22 +0000
commitcfdd150da8261ccbb707379f114d909f0d68999b (patch)
treefd058af70d0a2a62d109f8b24d6ecb82b7bc5fa6
parent6d6ea928c83b0d3ac92853e313f0859accf6e355 (diff)
downloadredmine-cfdd150da8261ccbb707379f114d909f0d68999b.tar.gz
redmine-cfdd150da8261ccbb707379f114d909f0d68999b.zip
assignee_avatar method causes NoMethodError if the given object is a group (#31391).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@18188 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/avatars_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 71898a4d4..7e2a1fffd 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -24,14 +24,14 @@ module AvatarsHelper
return '' unless user
options.merge!(:title => l(:field_assigned_to) + ": " + user.name)
- avatar(user, options).html_safe
+ avatar(user, options).to_s.html_safe
end
def author_avatar(user, options={})
return '' unless user
options.merge!(:title => l(:field_author) + ": " + user.name)
- avatar(user, options).html_safe
+ avatar(user, options).to_s.html_safe
end
# Returns the avatar image tag for the given +user+ if avatars are enabled