aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-21 20:54:28 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-21 20:54:28 -0700
commit1fa7e3322dc8ceac0da3b2b516ca338ee36c89a9 (patch)
tree56d33b8eb7acaaedf7e8be56361986decb4a9ba0 /actionpack/lib/action_controller/new_base
parent4c52ba278b8e349bc18cb89086af765d0828f0af (diff)
downloadrails-1fa7e3322dc8ceac0da3b2b516ca338ee36c89a9.tar.gz
rails-1fa7e3322dc8ceac0da3b2b516ca338ee36c89a9.tar.bz2
rails-1fa7e3322dc8ceac0da3b2b516ca338ee36c89a9.zip
Ruby 1.9 compat: don't rely on lexical scoping since the included block is called from dependency_module
Diffstat (limited to 'actionpack/lib/action_controller/new_base')
-rw-r--r--actionpack/lib/action_controller/new_base/render_options.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb
index 1df23deee7..2ce9d0c7ae 100644
--- a/actionpack/lib/action_controller/new_base/render_options.rb
+++ b/actionpack/lib/action_controller/new_base/render_options.rb
@@ -41,7 +41,7 @@ module ActionController
included do
extend ActiveSupport::DependencyModule
- depends_on RenderOptions
+ depends_on ::ActionController::RenderOptions
def self.register_renderer(name)
included { _add_render_option(name) }
@@ -83,4 +83,4 @@ module ActionController
end
end
end
-end \ No newline at end of file
+end