aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json/variable.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/variable.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/variable.rb')
-rw-r--r--activesupport/lib/active_support/json/variable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/variable.rb b/activesupport/lib/active_support/json/variable.rb
index 2c7b449a50..daa7449b71 100644
--- a/activesupport/lib/active_support/json/variable.rb
+++ b/activesupport/lib/active_support/json/variable.rb
@@ -3,7 +3,7 @@ module ActiveSupport
# A string that returns itself as its JSON-encoded form.
class Variable < String
private
- def rails_to_json(options = nil)
+ def rails_to_json(*)
self
end
end