diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-06-11 00:59:46 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-06-11 00:59:46 +0200 |
| commit | 4699c933019680e11616756b49ab2dad1e53dcda (patch) | |
| tree | 355c27c2beecb1f628001b90919a31502c5b9c68 /activesupport | |
| parent | 6c58585ff5b667de4f29860e4b06e743e0614891 (diff) | |
| parent | 029290f3def838c5293929d5bc42d3b6e5662d32 (diff) | |
| download | rails-4699c933019680e11616756b49ab2dad1e53dcda.tar.gz rails-4699c933019680e11616756b49ab2dad1e53dcda.tar.bz2 rails-4699c933019680e11616756b49ab2dad1e53dcda.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/wrap.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/wrap.rb b/activesupport/lib/active_support/core_ext/array/wrap.rb index 7fabae3138..f420270dc4 100644 --- a/activesupport/lib/active_support/core_ext/array/wrap.rb +++ b/activesupport/lib/active_support/core_ext/array/wrap.rb @@ -14,7 +14,7 @@ class Array # This method is similar in purpose to <tt>Kernel#Array</tt>, but there are some differences: # # * If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt> - # moves on to try +to_a+ if the returned value is +nil+, but <tt>Arraw.wrap</tt> returns + # moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns # such a +nil+ right away. # * If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt> # raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value. |