lib/haml/helpers/action_view_mods.rb in haml-1.0.4 vs lib/haml/helpers/action_view_mods.rb in haml-1.0.5

@@ -30,14 +30,18 @@
             alias_method :capture_erb_with_buffer, :capture_haml_with_buffer
           end
         end
         
         def concat(string, binding = nil) # :nodoc:
-          buffer.buffer.concat(string)
+          if is_haml?
+            buffer.buffer.concat(string)
+          else
+            old_concat(string, binding)
+          end
         end
         
         def form_tag(url_for_options = {}, options = {}, *parameters_for_url, &proc) # :nodoc:
-          if block_given?
+          if block_given? && is_haml?
             oldproc = proc 
             proc = bind_proc do |*args|
               concat "\n"
               tab_up
               oldproc.call(*args)