aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-21 16:03:04 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-21 16:03:04 -0800
commita110ff0fca45c6cc74c0da5d8dcdabeed43e78b1 (patch)
tree1ce28fde2e2ba384a60dc9bce4dc960b471d5aa4 /actionpack/lib/abstract_controller
parent36624b2c709925bcabb49d12082b9dd9d28c4c5c (diff)
downloadrails-a110ff0fca45c6cc74c0da5d8dcdabeed43e78b1.tar.gz
rails-a110ff0fca45c6cc74c0da5d8dcdabeed43e78b1.tar.bz2
rails-a110ff0fca45c6cc74c0da5d8dcdabeed43e78b1.zip
Dont introspect inline templates for the logger and cleanup a few styling issues
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index f4e1580977..64a8a5f241 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -125,8 +125,8 @@ module AbstractController
if options.key?(:text)
options[:_template] = ActionView::Template::Text.new(options[:text], format_for_text)
elsif options.key?(:inline)
- handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
- template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
+ handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
+ template = ActionView::Template.new(options[:inline], "inline template", handler, {})
options[:_template] = template
elsif options.key?(:template)
options[:_template_name] = options[:template]
@@ -194,9 +194,8 @@ module AbstractController
# otherwise, process the parameter into a ViewPathSet.
def view_paths=(paths)
clear_template_caches!
- self._view_paths = paths.is_a?(ActionView::PathSet) ?
- paths : ActionView::Base.process_view_paths(paths)
+ self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
end
end
end
-end
+end \ No newline at end of file