aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json/encoders/enumerable.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-26 20:04:47 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-26 20:04:47 -0700
commitee46ffedb88f812467485167036c7d254d0ce757 (patch)
tree3a2024e2edff6a61822a12c6308a1d917fa683fe /activesupport/lib/active_support/json/encoders/enumerable.rb
parent678385d307559b2b5737bb2b07f633d2b9a0802c (diff)
downloadrails-ee46ffedb88f812467485167036c7d254d0ce757.tar.gz
rails-ee46ffedb88f812467485167036c7d254d0ce757.tar.bz2
rails-ee46ffedb88f812467485167036c7d254d0ce757.zip
Now that we have a separate internal rails_to_json, use a separate circular reference stack instead of sticking it in the options hash
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/enumerable.rb')
-rw-r--r--activesupport/lib/active_support/json/encoders/enumerable.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/encoders/enumerable.rb b/activesupport/lib/active_support/json/encoders/enumerable.rb
index adde7445b3..898990a59c 100644
--- a/activesupport/lib/active_support/json/encoders/enumerable.rb
+++ b/activesupport/lib/active_support/json/encoders/enumerable.rb
@@ -7,7 +7,7 @@ module Enumerable
# # => users.to_json(:only => :name)
#
# will pass the <tt>:only => :name</tt> option to each user.
- def rails_to_json(options = nil) #:nodoc:
- "[#{map { |value| ActiveSupport::JSON.encode(value, options) } * ','}]"
+ def rails_to_json(options = nil, *args) #:nodoc:
+ "[#{map { |value| ActiveSupport::JSON.encode(value, options, *args) } * ','}]"
end
end