diff options
| author | Jan-Gerd Tenberge <janten@gmail.com> | 2015-10-23 04:00:08 +0300 |
|---|---|---|
| committer | Jan-Gerd Tenberge <janten@gmail.com> | 2015-10-23 04:00:08 +0300 |
| commit | c5146ca1517412b0389c483f18c13072e2abc4a3 (patch) | |
| tree | e056a0531834b377f4a1a757204db419c2b813be /app/helpers/application_helper.rb | |
| parent | 355a745842a757574457c5ea81096e42dad39e70 (diff) | |
Fix merge error
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 596a47938d6..3fa7d2bb1cd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -68,7 +68,7 @@ module ApplicationHelper end end - def avatar_icon(user_email = nil, size = nil, scale = 2) + def avatar_icon(user_or_email = nil, size = nil, scale = 2) if user_or_email.is_a?(User) user = user_or_email else |