diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-09-10 11:01:02 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-09-10 11:01:12 -0300 |
| commit | a46fa8df063e6ac1aea2bfdfffbf69cd28fef858 (patch) | |
| tree | 391c31350786fe108073b132639c1417b790b641 /actionpack/lib/abstract_controller | |
| parent | a1de8a8855abc01e1ae42551ee61c545ae169316 (diff) | |
| download | rails-a46fa8df063e6ac1aea2bfdfffbf69cd28fef858.tar.gz rails-a46fa8df063e6ac1aea2bfdfffbf69cd28fef858.tar.bz2 rails-a46fa8df063e6ac1aea2bfdfffbf69cd28fef858.zip | |
Make AC standalone rendering work
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index adef2d5cf0..6f6079d3c5 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -47,7 +47,6 @@ module AbstractController # Performs the actual template rendering. # :api: public def render_to_body(options = {}) - raise NotImplementedError, "no render operation defined" end # Return Content-Type of rendered content @@ -77,7 +76,11 @@ module AbstractController # render "foo/bar" to render :file => "foo/bar". # :api: plugin def _normalize_args(action=nil, options={}) - options + if action.is_a? Hash + action + else + options + end end # Normalize options. |