summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-31 12:36:27 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-31 12:36:27 +0000
commit323d23c44b58ab5f9d6ddd177d54d6fc7f1f4217 (patch)
treeaed4608112ca22a132faa4d4f1dcea4bcd9c4da2
parenta497f3a52de7843bbae0a418155bc03d166e18cf (diff)
* lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
parent is specified, since Text.check may need doctype. partially revert r26518. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/rexml/text.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c3730ac392d..f7d97d30efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 31 21:29:58 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
+ parent is specified, since Text.check may need doctype. partially
+ revert r26518.
+
Sun Jan 31 21:10:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
* vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969]
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index c01ab335904..5cef876c52a 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -117,7 +117,7 @@ module REXML
@string.gsub!( /\r\n?/, "\n" )
- Text.check(@string, illegal, doctype) if @raw
+ Text.check(@string, illegal, doctype) if @raw and @parent
end
def parent= parent