0
@@ -80,7 +80,7 @@ module Haml
0
 
0
     # Takes the various information about the opening tag for an
0
     # element, formats it, and adds it to the buffer.
0
-    def open_tag(name, tabulation, atomic, try_one_line, class_id, obj_ref, flattened, attributes_hash)
0
+    def open_tag(name, tabulation, atomic, try_one_line, class_id, obj_ref, attributes_hash)
0
       attributes = class_id
0
       if attributes_hash
0
         attributes_hash.keys.each { |key| attributes_hash[key.to_s] = attributes_hash.delete(key) }
0
@@ -94,8 +94,6 @@ module Haml
0
       elsif try_one_line
0
         @one_liner_pending = true
0
         str = ">"
0
-      elsif flattened
0
-        str = ">
"
0
       else
0
         str = ">\n"
0
       end

0
@@ -654,6 +654,10 @@ END
0
           attr_wrapper = @options[:attr_wrapper]
0
           if v.include? attr_wrapper
0
             if v.include? @other_quote_char
0
+              # An imperfection in LITERAL_VALUE_REGEX prevents this
0
+              # from ever actually being reached,
0
+              # but in case it becomes possible,
0
+              # I'm leaving it in.
0
               v = v.gsub(attr_wrapper, @quote_escape)
0
             else
0
               attr_wrapper = @other_quote_char
0
@@ -741,7 +745,7 @@ END
0
           push_silent "_hamlout.open_prerendered_tag(#{open_tag.dump}, #{@output_tabs})"
0
           return if do_one_liner
0
         else
0
-          push_silent "_hamlout.open_tag(#{tag_name.inspect}, #{@output_tabs}, #{atomic.inspect}, #{value_exists.inspect}, #{attributes.inspect}, #{object_ref}, #{flattened.inspect}, #{attributes_hash[1...-1]})", true
0
+          push_silent "_hamlout.open_tag(#{tag_name.inspect}, #{@output_tabs}, #{atomic.inspect}, #{value_exists.inspect}, #{attributes.inspect}, #{object_ref}, #{attributes_hash[1...-1]})", true
0
         end
0
           
0
         unless atomic

0
@@ -55,3 +55,6 @@ testtest
0
 <p class='article foo' id='article_1'>Blah</p>
0
 <p class='article quux qux' id='article_1'>Blump</p>
0
 Woah inner quotes
0
+<p class='dynamic_quote' dyn='3' quotes="single '">
0
+</p>
0
+<p class='dynamic_atomic' dyn='3' />

0
@@ -62,3 +62,5 @@
0
 %p.foo{:class => false ? 'bar' : ''}[@article] Blah
0
 %p.qux{:class => 'quux'}[@article] Blump
0
 == #{"Woah inner quotes"}
0
+%p.dynamic_quote{:quotes => "single '", :dyn => 1 + 2}
0
+%p.dynamic_atomic{:dyn => 1 + 2}/