0
@@ -23,6 +23,7 @@ module Haml
0
     def initialize(options = {})
0
       @options = options
0
       @quote_escape = options[:attr_wrapper] == '"' ? """ : "'"
0
+      @other_quote_char = options[:attr_wrapper] == '"' ? "'" : '"'
0
       @buffer = ""
0
       @one_liner_pending = false
0
       @tabulation = 0
0
@@ -172,7 +173,11 @@ module Haml
0
           v = v.to_s
0
           attr_wrapper = @options[:attr_wrapper]
0
           if v.include? attr_wrapper
0
-            v = v.gsub(attr_wrapper, @quote_escape)
0
+            if v.include? @other_quote_char
0
+              v = v.gsub(attr_wrapper, @quote_escape)
0
+            else
0
+              attr_wrapper = @other_quote_char
0
+            end
0
           end
0
           " #{a}=#{attr_wrapper}#{v}#{attr_wrapper}"
0
         end

0
@@ -60,7 +60,8 @@ class EngineTest < Test::Unit::TestCase
0
 
0
   def test_attr_wrapper
0
     assert_equal("<p strange=*attrs*>\n</p>\n", render("%p{ :strange => 'attrs'}", :attr_wrapper => '*'))
0
-    assert_equal("<p escaped=\"quo&quot;te\">\n</p>\n", render("%p{ :escaped => 'quo\"te'}", :attr_wrapper => '"'))
0
+    assert_equal("<p escaped='quo\"te'>\n</p>\n", render("%p{ :escaped => 'quo\"te'}", :attr_wrapper => '"'))
0
+    assert_equal("<p escaped=\"q'uo&quot;te\">\n</p>\n", render("%p{ :escaped => 'q\\'uo\"te'}", :attr_wrapper => '"'))
0
     assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n", render("!!! XML", :attr_wrapper => '"'))
0
   end
0