0
@@ -202,6 +202,7 @@ END
0
     def do_precompile
0
       push_silent <<-END
0
         def _haml_render
0
+        @haml_is_haml = true
0
         _hamlout = @haml_stack[-1]
0
         _erbout = _hamlout.buffer
0
       END
0
@@ -265,6 +266,7 @@ END
0
       # Close all the open tags
0
       @template_tabs.times { close }
0
 
0
+      push_silent "@haml_is_haml = false"
0
       push_silent "end"
0
     end
0
     
0
@@ -311,7 +313,7 @@ END
0
         sub_line = line[1..-1]
0
         unless sub_line[0] == SILENT_COMMENT
0
           mbk = mid_block_keyword?(line)
0
-          push_silent(sub_line, !mbk)
0
+          push_silent(sub_line, !mbk, true)
0
           if (@block_opened && !mbk) || line[1..-1].split(' ', 2)[0] == "case"
0
             push_and_tabulate([:script])
0
           end
0
@@ -423,12 +425,14 @@ END
0
 
0
     # Evaluates <tt>text</tt> in the context of <tt>@scope_object</tt>, but
0
     # does not output the result.
0
-    def push_silent(text, add_index = false)
0
-      if add_index
0
-        @precompiled << "@haml_lineno = #{@index}\n#{text}\n"
0
-      else
0
-        # Not really DRY, but probably faster
0
-        @precompiled << "#{text}\n"
0
+    def push_silent(text, add_index = false, can_suppress = false)
0
+      unless can_suppress && @options[:suppress_eval]
0
+        if add_index
0
+          @precompiled << "@haml_lineno = #{@index}\n#{text}\n"
0
+        else
0
+          # Not really DRY, but probably faster
0
+          @precompiled << "#{text}\n"
0
+        end
0
       end
0
     end
0
 
0
@@ -517,7 +521,7 @@ END
0
 
0
     # Closes a Ruby block.
0
     def close_block
0
-      push_silent "end"
0
+      push_silent "end", false, true
0
       @template_tabs -= 1
0
     end
0
 
0
@@ -541,7 +545,7 @@ END
0
     
0
     # Closes a loud Ruby block.
0
     def close_loud(command)
0
-      push_silent 'end'
0
+      push_silent 'end', false, true
0
       @precompiled << command
0
       @template_tabs -= 1
0
     end
0
@@ -592,7 +596,7 @@ END
0
 
0
         value_exists = !value.empty?
0
         attributes_hash = "nil" if attributes_hash.nil? || @options[:suppress_eval]
0
-        object_ref = "nil" unless object_ref
0
+        object_ref = "nil" if object_ref.nil? || @options[:suppress_eval]
0
 
0
         if @block_opened 
0
           if atomic

0
@@ -229,7 +229,7 @@ module Haml
0
     # also works in other ActionView templates,
0
     # where it will always return false.
0
     def is_haml?
0
-      @haml_stack ? @haml_stack.size > 0 : false
0
+      @haml_is_haml
0
     end
0
   end
0
 end

0
@@ -10,6 +10,18 @@ end
0
 
0
 if action_view_included
0
   module ActionView
0
+    class Base # :nodoc:
0
+      def render_with_haml(*args)        
0
+        was_haml = is_haml?
0
+        @haml_is_haml = false
0
+        res = render_without_haml(*args)
0
+        @haml_is_haml = was_haml
0
+        res
0
+      end
0
+      alias_method :render_without_haml, :render
0
+      alias_method :render, :render_with_haml
0
+    end
0
+
0
     # This overrides various helpers in ActionView
0
     # to make them work more effectively with Haml.
0
     module Helpers
0
@@ -22,7 +34,8 @@ if action_view_included
0
             concat_without_haml(string, binding)
0
           end
0
         end
0
-        alias_method_chain :concat, :haml
0
+        alias_method :concat_without_haml, :concat
0
+        alias_method :concat, :concat_with_haml
0
       end
0
       
0
       module FormTagHelper
0
@@ -40,7 +53,8 @@ if action_view_included
0
           concat "\n" if block_given? && is_haml?
0
           res
0
         end
0
-        alias_method_chain :form_tag, :haml
0
+        alias_method :form_tag_without_haml, :form_tag
0
+        alias_method :form_tag, :form_tag_with_haml
0
       end
0
       
0
       module FormHelper
0
@@ -56,7 +70,8 @@ if action_view_included
0
           form_for_without_haml(object_name, *args, &proc)
0
           concat "\n" if block_given? && is_haml?
0
         end
0
-        alias_method_chain :form_for, :haml
0
+        alias_method :form_for_without_haml, :form_for
0
+        alias_method :form_for, :form_for_with_haml
0
       end
0
       
0
       def generate_content_class_names

0
@@ -57,7 +57,9 @@ class EngineTest < Test::Unit::TestCase
0
 
0
   def test_stop_eval
0
     assert_equal("", render("= 'Hello'", :suppress_eval => true))
0
+    assert_equal("", render("- _hamlout << 'foo'", :suppress_eval => true))
0
     assert_equal("<div id='foo' />\n", render("#foo{:yes => 'no'}/", :suppress_eval => true))
0
+    assert_equal("<div />\n", render("%div[1]/", :suppress_eval => true))
0
 
0
     begin
0
       assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))

0
@@ -101,6 +101,10 @@ class HelperTest < Test::Unit::TestCase
0
 
0
   def test_is_haml
0
     assert(!ActionView::Base.new.is_haml?)
0
+    assert_equal("true\n", render("= is_haml?"))
0
+    assert_equal("true\n", render("= is_haml?", :action_view))
0
+    assert_equal("false", @base.render(:inline => '<%= is_haml? %>'))
0
+    assert_equal("false\n", render("= render :inline => '<%= is_haml? %>'", :action_view))
0
   end
0
 end
0