diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-28 09:12:42 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-28 09:12:42 +0000 |
| commit | bccd52dd9d777a0ea87242c6e2faa7d73f783fad (patch) | |
| tree | 60cf84ebdbfcdd884723c9765b54bdeeeba1a982 /ChangeLog | |
| parent | 1191b359297c5d3ee61264a38c79367c19b9a847 (diff) | |
merge revision(s) 39509,39511: [Backport #7961]
* lib/rexml/document.rb: move entity_expansion_limit accessor to ...
* lib/rexml/rexml.rb: ... here to make rexml/text independent from
REXML::Document. It causes circular require.
* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
deprecated.
* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
deprecated.
* lib/rexml/text.rb: add missing require "rexml/rexml" for
REXML.entity_expansion_limit.
Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]
* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...
* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
REXML.entity_expansion_text_limit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,16 @@ +Thu Mar 28 18:12:19 2013 Kouhei Sutou <kou@cozmixng.org> + + * lib/rexml/document.rb: move entity_expansion_text_limit accessor to ... + * lib/rexml/rexml.rb: ... here to make rexml/text independent from + REXML::Document. It causes circular require. + * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit): + deprecated. + * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=): + deprecated. + * lib/rexml/text.rb: add missing require "rexml/rexml" for + REXML.entity_expansion_text_limit. + Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961] + Thu Mar 21 20:34:52 2013 NAKAMURA Usaku <usa@ruby-lang.org> * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): |