0
@@ -60,18 +60,18 @@ module Haml
0
       if flattened
0
         result = Haml::Helpers.find_and_preserve(result)
0
       end
0
-      unless result.nil?
0
-        result = result.to_s
0
-        while result[-1] == 10 # \n
0
-          # String#chomp is slow
0
-          result = result[0...-1]
0
-        end
0
-        
0
-        result = result.gsub("\n", "\n#{tabs(tabulation)}")
0
-        push_text result, tabulation
0
+
0
+      result = result.to_s
0
+      while result[-1] == 10 # \n
0
+        # String#chomp is slow
0
+        result = result[0...-1]
0
       end
0
+      
0
+      result = result.gsub("\n", "\n#{tabs(tabulation)}")
0
+      push_text result, tabulation
0
       nil
0
     end
0
+
0
     
0
     def open_prerendered_tag(tag, tabulation)
0
       @buffer << "#{tabs(tabulation)}#{tag}"

0
@@ -58,6 +58,14 @@ class EngineTest < Test::Unit::TestCase
0
     assert_equal("<p>\n  Hello World\n</p>\n", render("%p\n  == Hello \#{who}", :locals => {:who => 'World'}))
0
   end
0
 
0
+  def test_nil_tag_value_should_render_as_empty
0
+    assert_equal("<p></p>\n", render("%p= nil"))
0
+  end
0
+
0
+  def test_tag_with_failed_if_should_render_as_empty
0
+    assert_equal("<p></p>\n", render("%p= 'Hello' if false"))
0
+  end
0
+
0
   # Options tests
0
 
0
   def test_stop_eval