Merge branch 'stable'

2008-07-03 23:10:58 -04:00 · 2008-07-03 23:10:58 -04:00 · 44d7f289c2
parent 6b0d6a7f60 07ffc82ee4
commit 44d7f289c2
1 changed files with 1 additions and 1 deletions
--- a/lib/haml/helpers.rb
+++ b/lib/haml/helpers.rb
@ -311,7 +311,7 @@ module Haml
    #
    def haml_tag(name, *rest, &block)
      name = name.to_s
-      text = rest.shift.to_s unless rest.first.is_a? Symbol
+      text = rest.shift.to_s unless [Symbol, Hash, NilClass].any? {|t| rest.first.is_a? t}
      flags = []
      flags << rest.shift while rest.first.is_a? Symbol
      attributes = Haml::Precompiler.build_attributes(haml_buffer.html?,