summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/rexml/attribute.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc062ea3b7b..5e27ec0e1fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 22 10:35:35 2016 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
+ entry reference name of double quote.
+ [Bug#12609][ruby-core:76509]
+ Patch by Joseph Marrero. Thanks!!!
+
Fri Jul 22 10:32:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* template/unicode_norm_gen.tmpl: Remove
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index e9917cf52d8..ca5984e178f 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -110,7 +110,7 @@ module REXML
# b.to_string # -> "ns:x='y'"
def to_string
if @element and @element.context and @element.context[:attribute_quote] == :quote
- %Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
+ %Q^#@expanded_name="#{to_s().gsub(/"/, '&quot;')}"^
else
"#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
end