diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 08:40:57 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 08:40:57 +0000 |
| commit | 4ba883561141543287ba20da2e6e22258e243346 (patch) | |
| tree | 57ba8a03bcfa0901b4096c6827cd70fbbcf04b90 /lib | |
| parent | e3b9c7e7877acbad2c169b79fef69f082c1beb02 (diff) | |
merges r20120 from trunk into ruby_1_9_1.
* lib/rexml/entity.rb (unnormalized): do not call
document.record_entity_expansion if document is nil.
see <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502535>.
Thanks, Naohisa Goto.
* test/rexml/test_document.rb: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rexml/entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb index a4093b680..d2f27ecd4 100644 --- a/lib/rexml/entity.rb +++ b/lib/rexml/entity.rb @@ -73,7 +73,7 @@ module REXML # all entities -- both %ent; and &ent; entities. This differs from # +value()+ in that +value+ only replaces %ent; entities. def unnormalized - document.record_entity_expansion + document.record_entity_expansion unless document.nil? v = value() return nil if v.nil? @unnormalized = Text::unnormalize(v, parent) |