* array.c (ary_join_1): should recurse for element array.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 744a2e285f..fb0cb79bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 11 00:11:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_join_1): should recurse for element array.
+
 Fri Jul 10 23:10:11 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* io.c (io_strip_bom): ungetbyte third byte when UTF-16LE.
diff --git a/array.c b/array.c
index 0b825dab5f..52981a2b4f 100644
--- a/array.c
+++ b/array.c
@@ -1570,6 +1570,7 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
 	    rb_str_buf_append(result, val);
 	    break;
 	  case T_ARRAY:
+	    obj = val;
 	  ary_join:
 	    if (val == ary) {
 		val = rb_usascii_str_new2("[...]");
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 469cd53865..c51e179a5f 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -1496,6 +1496,7 @@ class TestArray < Test::Unit::TestCase
       [self]
     end
     assert_equal("[...]", [a].join, '[ruby-core:24150]')
+    assert_equal("12345", [1,[2,[3,4],5]].join)
   end
 
   def test_to_a2
diff --git a/version.h b/version.h
index a326d8dbed..e03c288092 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-07-10"
+#define RUBY_RELEASE_DATE "2009-07-11"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"