diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_view/renderer/renderer.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 5b45a13269..1395db3dc1 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -1,6 +1,7 @@ require "abstract_controller/base" require "action_view" require "active_support/core_ext/object/instance_variables" +require "active_support/hash_with_indifferent_access" module AbstractController class DoubleRenderError < Error @@ -138,7 +139,7 @@ module AbstractController end # Normalize args by converting render "foo" to render :action => "foo" and - # render "foo/bar" to render :file => "foo/bar". + # render "foo/bar" to render :app_template_file => "foo/bar". # :api: plugin def _normalize_args(action=nil, options={}) case action diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb index 0f359899d6..5d783fe394 100644 --- a/actionpack/lib/action_view/renderer/renderer.rb +++ b/actionpack/lib/action_view/renderer/renderer.rb @@ -1,3 +1,5 @@ +require 'active_support/hash_with_indifferent_access' + module ActionView # This is the main entry point for rendering. It basically delegates # to other objects like TemplateRenderer and PartialRenderer which |