diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-21 16:31:05 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-21 16:31:05 -0700 |
commit | e773d0e68ac64bd26d86860a9a8e0048e2b6bb48 (patch) | |
tree | 58146d9f9e337595b61ae32f53d4c7918980e9ff /actionpack | |
parent | 1a52b246eb245d159a1c331417a4b14923e9bc4e (diff) | |
download | rails-e773d0e68ac64bd26d86860a9a8e0048e2b6bb48.tar.gz rails-e773d0e68ac64bd26d86860a9a8e0048e2b6bb48.tar.bz2 rails-e773d0e68ac64bd26d86860a9a8e0048e2b6bb48.zip |
Renamed #implicit_render to #default_render in new base to support the default_render API
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index b432060bc1..034e614d6e 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -38,18 +38,18 @@ module ActionController module ImplicitRender def process_action(method_name) ret = super - render if response_body.nil? + default_render if response_body.nil? ret end - def _implicit_render + def default_render render end def method_for_action(action_name) super || begin if view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path) - "_implicit_render" + "default_render" end end end |