mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rexml/text.rb (REXML::Text#initialize): REXML::Text.new checks
raw text for illegal characters without entity check, for the sake of 1.8 compatibility. This had caused rubyspec error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b3b3223e58
commit
f2bd994409
2 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
Tue Feb 9 21:27:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* lib/rexml/text.rb (REXML::Text#initialize): REXML::Text.new checks
|
||||
raw text for illegal characters without entity check, for the sake
|
||||
of 1.8 compatibility. This had caused rubyspec error.
|
||||
|
||||
Mon Feb 8 23:49:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* io.c (rb_io_getline_fast): wrong calculation of new position
|
||||
|
|
|
@ -117,7 +117,7 @@ module REXML
|
|||
|
||||
@string.gsub!( /\r\n?/, "\n" )
|
||||
|
||||
Text.check(@string, illegal, doctype) if @raw and @parent
|
||||
Text.check(@string, illegal, doctype) if @raw
|
||||
end
|
||||
|
||||
def parent= parent
|
||||
|
@ -160,7 +160,7 @@ module REXML
|
|||
else
|
||||
raise "Illegal character '#{$1}' in raw string \"#{string}\""
|
||||
end
|
||||
elsif $3 and !SUBSTITUTES.include?($1)
|
||||
elsif @parent and $3 and !SUBSTITUTES.include?($1)
|
||||
if !doctype or !doctype.entities.has_key?($3)
|
||||
raise "Undeclared entity '#{$1}' in raw string \"#{string}\""
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue