From 3c84bb31479840329e4d8953a5828781b07f9ab5 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 21 May 2009 14:47:11 +0000 Subject: merges r23361 from trunk into ruby_1_9_1. -- * array.c (rb_ary_flatten_bang): returns nil if nothing changed. a patch from Marc-Andre Lafortune in [ruby-core:23382]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'array.c') diff --git a/array.c b/array.c index 3301621603..6923b382cf 100644 --- a/array.c +++ b/array.c @@ -3190,7 +3190,7 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary) rb_scan_args(argc, argv, "01", &lv); if (!NIL_P(lv)) level = NUM2INT(lv); - if (level == 0) return ary; + if (level == 0) return Qnil; result = flatten(ary, level, &mod); if (mod == 0) return Qnil; -- cgit v1.2.3