aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-07 06:32:54 -0300
committerYehuda Katz <wycats@gmail.com>2009-08-07 06:32:54 -0300
commit606e950ccbd02a10f724c73543575a2a4e1ed8cb (patch)
tree6bfcb1b84eb0082486c829fb68f8d9a5986edb15
parentd94ba11295c74e5a661a78a93d6d0259ab01fa50 (diff)
downloadrails-606e950ccbd02a10f724c73543575a2a4e1ed8cb.tar.gz
rails-606e950ccbd02a10f724c73543575a2a4e1ed8cb.tar.bz2
rails-606e950ccbd02a10f724c73543575a2a4e1ed8cb.zip
Whitespace
-rw-r--r--actionpack/lib/action_view/render/rendering.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 39b8608c68..9c25fab6bb 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -16,16 +16,16 @@ module ActionView
_render_partial(:partial => options, :locals => locals || {})
when Hash
layout = options[:layout]
-
+
if block_given?
return concat(_render_partial(options.merge(:partial => layout), &block))
elsif options.key?(:partial)
layout = _pick_partial_template(layout) if layout
return _render_content(_render_partial(options), layout, options[:locals])
end
-
+
layout = find_by_parts(layout, {:formats => formats}) if layout
-
+
if file = options[:file]
template = find_by_parts(file, {:formats => formats})
_render_template(template, layout, :locals => options[:locals] || {})
@@ -38,17 +38,17 @@ module ActionView
update_page(&block)
end
end
-
+
def _render_content(content, layout, locals)
return content unless layout
-
+
locals ||= {}
if controller && layout
@_layout = layout.identifier
logger.info("Rendering template within #{layout.identifier}") if logger
end
-
+
begin
old_content, @_content_for[:layout] = @_content_for[:layout], content
@@ -161,7 +161,7 @@ module ActionView
else
_render_single_template(template, locals)
end
-
+
_render_content(content, layout, locals)
end
end