aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/base.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 9bf044b6c0..29f1c84f03 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -866,9 +866,11 @@ module ActionController #:nodoc:
elsif options == :update
options = extra_options.merge({ :update => true })
elsif options.is_a?(String)
- case options.index('/')
+ case position = options.index('/')
when 0
extra_options[:file] = options
+ else
+ extra_options[:template] = options
end
options = extra_options