diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-10-25 07:09:09 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-10-25 07:09:09 +0000 |
| commit | 192e463d058f07c878534c23cf7da5a66a27eb8d (patch) | |
| tree | 0624d6411aaac6a97ae58cb5c2b902220c1c7085 /activesupport/lib | |
| parent | 2d208eb3a09bf5b091464b7a4bbd00647eb7dfb2 (diff) | |
| download | rails-192e463d058f07c878534c23cf7da5a66a27eb8d.tar.gz rails-192e463d058f07c878534c23cf7da5a66a27eb8d.tar.bz2 rails-192e463d058f07c878534c23cf7da5a66a27eb8d.zip | |
Add an ignored options parameter to ActiveSupport::JSON::Variable#to_json to make sure it duck-types nicely with the other JSON types. [Pascal Belloncle]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8013 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/json/variable.rb | 2 |
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 0af98f0968..7fd23b0a9e 100644 --- a/activesupport/lib/active_support/json/variable.rb +++ b/activesupport/lib/active_support/json/variable.rb @@ -2,7 +2,7 @@ module ActiveSupport module JSON # A string that returns itself as its JSON-encoded form. class Variable < String - def to_json + def to_json(options=nil) self end end |