aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-10-11 00:21:59 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-10-11 00:21:59 +0000
commit21b51eda632ab202bd2eeaa726a05af52a38bad0 (patch)
tree4d76a24d20554e26e05212c333c259555234c832 /actionpack
parentaa4165cb7e5c9677ae4aa57c1f7cf83e33221cdb (diff)
downloadrails-21b51eda632ab202bd2eeaa726a05af52a38bad0.tar.gz
rails-21b51eda632ab202bd2eeaa726a05af52a38bad0.tar.bz2
rails-21b51eda632ab202bd2eeaa726a05af52a38bad0.zip
JavaScriptVariableProxy#to_json ignores the options arg
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7831 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/prototype_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 40b2b24368..e19b9097ea 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -867,7 +867,7 @@ module ActionView
true
end
- def to_json
+ def to_json(options = nil)
@variable
end