diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-08 11:32:06 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-08 11:32:06 +0000 |
commit | da8a6a6594a12fdb2484f917e957378663779de0 (patch) | |
tree | a207726dffe132f41462dabd806e111f4438a0e3 /array.c | |
parent | 54ecf81ffc498acb47f025be471fe5177f89b24c (diff) |
merge revision(s) 33363:
* array.c (ary_join_1): should not copy the encoding of non-string
element after string element. [ruby-core:39776] [Bug #5379]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1644,6 +1644,7 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first) case T_STRING: str_join: rb_str_buf_append(result, val); + *first = FALSE; break; case T_ARRAY: obj = val; |