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 /actionpack/lib/action_view | |
| 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 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index a44c144d53..1fbe012a95 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -1180,11 +1180,11 @@ module ActionView # The JSON Encoder calls this to check for the +to_json+ method # Since it's a blank slate object, I suppose it responds to anything. - def respond_to?(method) + def respond_to?(*) true end - def rails_to_json(options = nil) + def rails_to_json(*) @variable end |