aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/layouts.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-10-18 22:52:36 -0200
committerYehuda Katz <wycats@gmail.com>2009-11-01 02:23:48 +0100
commit43d5504f0a6a831474d149aa5f1ebb2545790152 (patch)
treeab3c28e28279c029784b5c3e129d0e3c0d8faa75 /actionpack/lib/action_controller/metal/layouts.rb
parent684c2dc20801b7fcc941ec9478d33d3bf7c74551 (diff)
downloadrails-43d5504f0a6a831474d149aa5f1ebb2545790152.tar.gz
rails-43d5504f0a6a831474d149aa5f1ebb2545790152.tar.bz2
rails-43d5504f0a6a831474d149aa5f1ebb2545790152.zip
Move all render and layout pieces required in ActionMailer from ActionController to AbstractController.
Diffstat (limited to 'actionpack/lib/action_controller/metal/layouts.rb')
-rw-r--r--actionpack/lib/action_controller/metal/layouts.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/metal/layouts.rb b/actionpack/lib/action_controller/metal/layouts.rb
index e7859e3fec..cc7088248a 100644
--- a/actionpack/lib/action_controller/metal/layouts.rb
+++ b/actionpack/lib/action_controller/metal/layouts.rb
@@ -167,15 +167,5 @@ module ActionController
controller_path
end
end
-
- private
- def _determine_template(options)
- super
-
- return if (options.key?(:text) || options.key?(:inline) || options.key?(:partial)) && !options.key?(:layout)
- layout = options.key?(:layout) ? options[:layout] : :default
- options[:_layout] = _layout_for_option(layout, options[:_template].details)
- end
-
end
end