summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-25 07:37:40 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-25 07:37:40 +0000
commit61087d93c539244760395ac263528c6ae5cacb27 (patch)
tree51d8357fe0286263852583a37bd45ee80421064b /lib
parente97bf2aa9ccd7f05015901fd6084284d0d99743f (diff)
merge revision(s) 25396:
* lib/rexml/element.rb (text=): false should be converted to string. A patch by Teruo Oshida [ruby-dev:38351] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rexml/element.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 3db87c6126..1f443956c8 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -492,7 +492,7 @@ module REXML
def text=( text )
if text.kind_of? String
text = Text.new( text, whitespace(), nil, raw() )
- elsif text and !text.kind_of? Text
+ elsif !text.nil? and !text.kind_of? Text
text = Text.new( text.to_s, whitespace(), nil, raw() )
end
old_text = get_text