Re-added some needed .html_safes.

gunn · Oct 2, 2012 · 5d450c4 · 5d450c4
1 parent ef27f78
commit 5d450c4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
@@ -76,7 +76,7 @@ def navigation nodes_stack, nodes, level=0
           link_to node.label_plural, url, :class => "pjax#{level_class}"
         end
         li + navigation(nodes_stack, nodes_stack.select{ |n| n.parent.to_s == node.abstract_model.model_name}, level+1)
-      end.join
+      end.join.html_safe
     end
 
     def breadcrumb action = @action, acc = []
@@ -119,13 +119,13 @@ def bulk_menu abstract_model = @abstract_model
       actions = actions(:bulkable, abstract_model)
       return '' if actions.empty?
       content_tag :li, { :class => 'dropdown', :style => 'float:right' } do
-        content_tag(:a, { :class => 'dropdown-toggle', :'data-toggle' => "dropdown", :href => '#' }) { t('admin.misc.bulk_menu_title') + '<b class="caret"></b>' } +
+        content_tag(:a, { :class => 'dropdown-toggle', :'data-toggle' => "dropdown", :href => '#' }) { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
         content_tag(:ul, :class => 'dropdown-menu', :style => 'left:auto; right:0;') do
           actions.map do |action|
             content_tag :li do
               link_to wording_for(:bulk_link, action), '#', :onclick => "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
             end
-          end.join
+          end.join.html_safe
         end
       end.html_safe
     end