diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-05 00:02:52 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-05 00:02:52 +0000 |
| commit | 284dc8effcf9914e944a3f386a38b49b56a8012d (patch) | |
| tree | 4900a4d9b63180fb39280683e160050b776da6d0 /lib | |
| parent | a120cd596658f4bd85b332149bd204299e2ab0e7 (diff) | |
| download | ruby-284dc8effcf9914e944a3f386a38b49b56a8012d.tar.gz | |
merge revision(s) 20121:
* 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. backported from trunk.
* test/rexml/test_document.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22060 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 94e6d3ff1b..7e9b4e5e1a 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) |