From af375a5eb3aba149590be1636480e1c3976c124f Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 6 Aug 2009 19:45:40 -0300
Subject: Replace _action_view with view_context to reflect that it is public
 and that it does not need to be an ActionView instance

---
 actionpack/lib/action_controller/base/compatibility.rb  | 4 ++--
 actionpack/lib/action_controller/base/render_options.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/actionpack/lib/action_controller/base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
index 13813ffd17..23e7b1b3af 100644
--- a/actionpack/lib/action_controller/base/compatibility.rb
+++ b/actionpack/lib/action_controller/base/compatibility.rb
@@ -72,7 +72,7 @@ module ActionController
 
     # TODO: Remove this after we flip
     def template
-      @template ||= _action_view
+      @template ||= view_context
     end
 
     def process_action(*)
@@ -141,7 +141,7 @@ module ActionController
     end
 
     def view_paths
-      _action_view.view_paths
+      view_context.view_paths
     end
   end
 end
diff --git a/actionpack/lib/action_controller/base/render_options.rb b/actionpack/lib/action_controller/base/render_options.rb
index fc9a02626f..65ee09883e 100644
--- a/actionpack/lib/action_controller/base/render_options.rb
+++ b/actionpack/lib/action_controller/base/render_options.rb
@@ -85,7 +85,7 @@ module ActionController
       register_renderer :update
 
       def _render_update(proc, options)
-        generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(_action_view, &proc)
+        generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
         self.content_type = Mime::JS
         self.response_body = generator.to_s
       end
-- 
cgit v1.2.3