diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
| commit | 5a1fe9039b33414b7088813712e03bbe38567cff (patch) | |
| tree | 10e3a15c06494dd09c0324dca894ddcbb68ce582 /actionpack/lib/action_controller/new_base/layouts.rb | |
| parent | 3384f073e35c5391deaeb209a62a485a0c4dd7b1 (diff) | |
| parent | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff) | |
| download | rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.gz rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.bz2 rails-5a1fe9039b33414b7088813712e03bbe38567cff.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/new_base/layouts.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/layouts.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb index 149847c968..a8e0809ac6 100644 --- a/actionpack/lib/action_controller/new_base/layouts.rb +++ b/actionpack/lib/action_controller/new_base/layouts.rb @@ -9,7 +9,7 @@ module ActionController end end - def render_to_string(options) + def render_to_body(options) # render :text => ..., :layout => ... # or # render :anything_else @@ -34,4 +34,4 @@ module ActionController end end -end
\ No newline at end of file +end |