Make the output of stylesheet_link_tag etc. html_safe

padrino · Jan 31, 2013 · 0f179db · 0f179db
1 parent 2562ddc
commit 0f179db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/padrino-helpers/lib/padrino-helpers/asset_tag_helpers.rb b/padrino-helpers/lib/padrino-helpers/asset_tag_helpers.rb
@@ -294,7 +294,7 @@ def stylesheet_link_tag(*sources)
         options.reverse_merge!(:media => 'screen', :rel => 'stylesheet', :type => 'text/css')
         sources.flatten.map { |source|
           tag(:link, options.reverse_merge(:href => asset_path(:css, source)))
-        }.join("\n")
+        }.join("\n").html_safe
       end
 
       ##
@@ -317,7 +317,7 @@ def javascript_include_tag(*sources)
         options.reverse_merge!(:type => 'text/javascript')
         sources.flatten.map { |source|
           content_tag(:script, nil, options.reverse_merge(:src => asset_path(:js, source)))
-        }.join("\n")
+        }.join("\n").html_safe
       end
 
       ##

diff --git a/padrino-helpers/lib/padrino-helpers/form_builder/abstract_form_builder.rb b/padrino-helpers/lib/padrino-helpers/form_builder/abstract_form_builder.rb
@@ -166,7 +166,7 @@ def fields_for(child_association, instance_or_collection=nil, &block)
           result = nested_objects.each_with_index.map do |child_instance, index|
             nested_options[:index] = include_index ? index : nil
             @template.fields_for(child_instance,  { :nested => nested_options }, &block)
-          end.join("\n")
+          end.join("\n").html_safe
         end
 
         protected