aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-01-22 07:41:27 +0000
committerMarcel Molina <marcel@vernix.org>2006-01-22 07:41:27 +0000
commit8d4d88a4f01ed7b569b62489654f585434beea3a (patch)
treefe1214a4aea54c08c15d61d01cb923048c417b7f
parentcffd1a9c3ac74dfd45dfef573b8592408f83481c (diff)
downloadrails-8d4d88a4f01ed7b569b62489654f585434beea3a.tar.gz
rails-8d4d88a4f01ed7b569b62489654f585434beea3a.tar.bz2
rails-8d4d88a4f01ed7b569b62489654f585434beea3a.zip
Change layout discovery to take into account the change in semantics with File.join and nil arguments.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3462 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/layout.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index a99aac02a2..62276e1996 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Change layout discovery to take into account the change in semantics with File.join and nil arguments. [Marcel Molina Jr.]
+
* Raise a RedirectBackError if redirect_to :back is called when there's no HTTP_REFERER defined #3049 [kevin.clark@gmail.com]
* Treat timestamps like datetimes for scaffolding purposes #3388 [Maik Schmidt]
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 94fa4cc4ba..182a23a7d1 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -207,7 +207,7 @@ module ActionController #:nodoc:
# Explicitly passed layout names with slashes are looked up relative to the template root,
# but auto-discovered layouts derived from a nested controller will contain a slash, though be relative
# to the 'layouts' directory so we have to check the file system to infer which case the layout name came from.
- nested_controller = File.directory?(File.dirname(File.join(self.class.template_root, 'layouts', active_layout)))
+ nested_controller = File.directory?(File.dirname(File.join(self.class.template_root, 'layouts', active_layout))) if active_layout
active_layout.include?('/') && !nested_controller ? active_layout : "layouts/#{active_layout}" if active_layout
end