aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-04-01 07:39:14 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-04-01 07:39:14 +0000
commit41ac6c553fc3e41970795a11bee9611249063235 (patch)
tree37cc17445096c20c8811d2b9a5d574fddec7927b /actionpack
parent30fa377f330ca8a9543e7079ed6f90a7ca42668d (diff)
downloadrails-41ac6c553fc3e41970795a11bee9611249063235.tar.gz
rails-41ac6c553fc3e41970795a11bee9611249063235.tar.bz2
rails-41ac6c553fc3e41970795a11bee9611249063235.zip
Ruby 1.9 compat: toplevel AS reference within BasicObject
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9195 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 6f5acac137..725e968ddd 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1204,7 +1204,7 @@ module ActionView
append_enumerable_function!("zip(#{arguments_for_call arguments}")
if block
function_chain[-1] += ", function(array) {"
- yield ActiveSupport::JSON::Variable.new('array')
+ yield ::ActiveSupport::JSON::Variable.new('array')
add_return_statement!
@generator << '});'
else