From 1fa7e3322dc8ceac0da3b2b516ca338ee36c89a9 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 21 May 2009 20:54:28 -0700
Subject: Ruby 1.9 compat: don't rely on lexical scoping since the included
 block is called from dependency_module

---
 actionpack/lib/action_controller/new_base/render_options.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/new_base')

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
-- 
cgit v1.2.3