aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorthedarkone <nobody>2009-03-05 18:49:22 -0600
committerJoshua Peek <josh@joshpeek.com>2009-03-05 18:49:22 -0600
commit3191535ff0912e751dcf411c57923ec79b72944d (patch)
treecf6b10917981e6aebabd8d79abf3ea8759766326 /actionpack/lib
parent5b7527ca44521edf9782b3d7f449bf09a29267f2 (diff)
downloadrails-3191535ff0912e751dcf411c57923ec79b72944d.tar.gz
rails-3191535ff0912e751dcf411c57923ec79b72944d.tar.bz2
rails-3191535ff0912e751dcf411c57923ec79b72944d.zip
Fix layouts with absolute paths [#2134 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/base.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index b769a2e67e..5da47ce317 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -913,7 +913,6 @@ module ActionController #:nodoc:
layout = pick_layout(options)
response.layout = layout.path_without_format_and_extension if layout
logger.info("Rendering template within #{layout.path_without_format_and_extension}") if logger && layout
- layout = layout.path_without_format_and_extension if layout
if content_type = options[:content_type]
response.content_type = content_type.to_s