diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4a02d8376..806d59da1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -60,23 +60,23 @@ module ApplicationHelper only_path = options[:only_path].nil? ? true : options[:only_path] case principal when User - name = h(principal.name(options[:format])) - name = "@".html_safe + name if options[:mention] + name = principal.name(options[:format]) + name = "@#{name}" if options[:mention] css_classes = '' if principal.active? || (User.current.admin? && principal.logged?) url = user_url(principal, :only_path => only_path) css_classes += principal.css_classes end when Group - name = h(principal.to_s) + name = principal.to_s url = group_url(principal, :only_path => only_path) css_classes = principal.css_classes else - name = h(principal.to_s) + name = principal.to_s end css_classes += " #{options[:class]}" if css_classes && options[:class].present? - url ? link_to(principal_icon(principal.class.name.downcase).to_s + name, url, :class => css_classes) : name + url ? link_to(principal_icon(principal.class.name.downcase).to_s + name, url, :class => css_classes) : h(name) end # Displays a link to edit group page if current user is admin |