aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-01-27 11:08:29 -0600
committerJoshua Peek <josh@joshpeek.com>2009-01-27 11:08:29 -0600
commita1ac635d9655cd26f86593263c3e9b956d330141 (patch)
tree2d407db6a21a26f9259cde59ac8546ca0e6fecd8 /actionpack
parent5fe6635e05a18b312c47fe6bbbaf88fd62e7703d (diff)
downloadrails-a1ac635d9655cd26f86593263c3e9b956d330141.tar.gz
rails-a1ac635d9655cd26f86593263c3e9b956d330141.tar.bz2
rails-a1ac635d9655cd26f86593263c3e9b956d330141.zip
Ensure the full path is used when searching for layouts [#1803 state:resolved]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/layout.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 159c5c7326..183d56c2e8 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -179,7 +179,7 @@ module ActionController #:nodoc:
end
def layout_list #:nodoc:
- Array(view_paths).sum([]) { |path| Dir["#{path}/layouts/**/*"] }
+ Array(view_paths).sum([]) { |path| Dir["#{path.to_str}/layouts/**/*"] }
end
def find_layout(layout, *formats) #:nodoc: