From: Go MAEDA <maeda@farend.jp>
Date: Wed, 22 May 2019 08:13:22 +0000 (+0000)
Subject: assignee_avatar method causes NoMethodError if the given object is a group (#31391).
X-Git-Tag: 4.1.0~865
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cfdd150da8261ccbb707379f114d909f0d68999b;p=redmine.git

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
---

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