diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-04-29 17:32:39 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:31:02 -0700 |
| commit | 49834e088bf8d02a4f75793a42868f2aea8749a4 (patch) | |
| tree | 314643bcdaabd64780f027756ca4710c6a2d72ac /actionpack/lib/action_controller/new_base/renderer.rb | |
| parent | 0c3d9bc4c2b329cb754bfed1e465f99d058e1193 (diff) | |
| download | rails-49834e088bf8d02a4f75793a42868f2aea8749a4.tar.gz rails-49834e088bf8d02a4f75793a42868f2aea8749a4.tar.bz2 rails-49834e088bf8d02a4f75793a42868f2aea8749a4.zip | |
Support implicit render and blank render
Diffstat (limited to 'actionpack/lib/action_controller/new_base/renderer.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/renderer.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb index df07edbd90..096a63e406 100644 --- a/actionpack/lib/action_controller/new_base/renderer.rb +++ b/actionpack/lib/action_controller/new_base/renderer.rb @@ -7,14 +7,7 @@ module ActionController super end - def render(action, options = {}) - # TODO: Move this into #render_to_body - if action.is_a?(Hash) - options, action = action, nil - else - options.merge! :action => action - end - + def render(options = {}) _process_options(options) super(options) |