diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-11 14:48:58 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-11 14:48:58 -0700 |
| commit | 0f6e764e4060b75ea8a335e6971209a08bf8b40a (patch) | |
| tree | 8907c891ac1b067036f636fa23948fcec0383800 /actionpack/lib/action_controller/new_base/renderer.rb | |
| parent | 6694bd46f59eb9b9b23afbd0d9484fd87e8fe350 (diff) | |
| download | rails-0f6e764e4060b75ea8a335e6971209a08bf8b40a.tar.gz rails-0f6e764e4060b75ea8a335e6971209a08bf8b40a.tar.bz2 rails-0f6e764e4060b75ea8a335e6971209a08bf8b40a.zip | |
Fixed a bug with handling render options
Diffstat (limited to 'actionpack/lib/action_controller/new_base/renderer.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/renderer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb index 4c4a74979b..bedd1d7a23 100644 --- a/actionpack/lib/action_controller/new_base/renderer.rb +++ b/actionpack/lib/action_controller/new_base/renderer.rb @@ -23,8 +23,8 @@ module ActionController options[:_template] = template elsif options.key?(:template) options[:_template_name] = options[:template] - elsif options.key?(:action) - options[:_template_name] = options[:action].to_s + else + options[:_template_name] = (options[:action] || action_name).to_s options[:_prefix] = _prefix end |