diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-26 20:04:47 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-26 20:04:47 -0700 |
commit | ee46ffedb88f812467485167036c7d254d0ce757 (patch) | |
tree | 3a2024e2edff6a61822a12c6308a1d917fa683fe /activesupport/lib/active_support/json/encoders/symbol.rb | |
parent | 678385d307559b2b5737bb2b07f633d2b9a0802c (diff) | |
download | rails-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/symbol.rb')
-rw-r--r-- | activesupport/lib/active_support/json/encoders/symbol.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/encoders/symbol.rb b/activesupport/lib/active_support/json/encoders/symbol.rb index 333cf773c1..d575350a4e 100644 --- a/activesupport/lib/active_support/json/encoders/symbol.rb +++ b/activesupport/lib/active_support/json/encoders/symbol.rb @@ -1,6 +1,6 @@ class Symbol private - def rails_to_json(options = nil) - ActiveSupport::JSON.encode(to_s, options) + def rails_to_json(*args) + ActiveSupport::JSON.encode(to_s, *args) end end |