shyouhei	2009-11-25 16:37:40 +0900 (Wed, 25 Nov 2009)

  New Revision: 25915

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25915

  Log:
    merge revision(s) 25396:
    * lib/rexml/element.rb (text=): false should be converted to string.
      A patch by Teruo Oshida [ruby-dev:38351]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/rexml/element.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 25914)
+++ ruby_1_8_7/ChangeLog	(revision 25915)
@@ -1,3 +1,8 @@
+Wed Nov 25 16:28:11 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/rexml/element.rb (text=): false should be converted to string.
+	  A patch by Teruo Oshida [ruby-dev:38351]
+
 Wed Nov 25 16:18:37 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_clear_cache_for_undef): clear entries for inherited
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 25914)
+++ ruby_1_8_7/version.h	(revision 25915)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-11-25"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091125
-#define RUBY_PATCHLEVEL 221
+#define RUBY_PATCHLEVEL 222
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/rexml/element.rb
===================================================================
--- ruby_1_8_7/lib/rexml/element.rb	(revision 25914)
+++ ruby_1_8_7/lib/rexml/element.rb	(revision 25915)
@@ -492,7 +492,7 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/