merge revision(s) 20103:

	* array.c (rb_ary_join): do not repeat self in a recursive array.
	  [ruby-dev:37019]


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

1 files changed, 1 insertions, 1 deletions

diff --git a/array.c b/array.c
index 503a7adba3..6441d871ed 100644
--- a/array.c
+++ b/array.c
@@ -1286,7 +1286,7 @@ rb_ary_join(ary, sep)
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
 		tmp = rb_str_new2("[...]");
 	    }
 	    else {