Commit 3660383adb6b495695f9163f57f0f5d59d329ed4
1 parent
8b7097ab
Exists in
profile_api_improvements
and in
1 other branch
fix html safe in community administration menu
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -880,7 +880,7 @@ module ApplicationHelper | @@ -880,7 +880,7 @@ module ApplicationHelper | ||
| 880 | link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier) | 880 | link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier) |
| 881 | end | 881 | end |
| 882 | link = list.map do |element| | 882 | link = list.map do |element| |
| 883 | - link_to(content_tag('strong', _('<span>Manage</span> %s') % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s') % element.short_name) | 883 | + link_to(content_tag('strong', _('<span>Manage</span> %s').html_safe % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s').html_safe % element.short_name) |
| 884 | end | 884 | end |
| 885 | if link_to_all | 885 | if link_to_all |
| 886 | link << link_to_all | 886 | link << link_to_all |
| @@ -921,7 +921,7 @@ module ApplicationHelper | @@ -921,7 +921,7 @@ module ApplicationHelper | ||
| 921 | logout_link = link_to(logout_icon.html_safe, { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) | 921 | logout_link = link_to(logout_icon.html_safe, { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) |
| 922 | join_result = safe_join( | 922 | join_result = safe_join( |
| 923 | [welcome_span.html_safe, render_environment_features(:usermenu).html_safe, admin_link.html_safe, | 923 | [welcome_span.html_safe, render_environment_features(:usermenu).html_safe, admin_link.html_safe, |
| 924 | - manage_enterprises.html_safe, manage_communities.html_safe, ctrl_panel_link.html_safe, | 924 | + manage_enterprises, manage_communities, ctrl_panel_link.html_safe, |
| 925 | pending_tasks_count.html_safe, logout_link.html_safe], "") | 925 | pending_tasks_count.html_safe, logout_link.html_safe], "") |
| 926 | join_result | 926 | join_result |
| 927 | end | 927 | end |