diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-30 10:53:14 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-30 10:53:19 -0800 |
| commit | da10673e32718d6a0619bd0f4b4d3d796db86a1a (patch) | |
| tree | 7bdb7868b0be65daec06ba729f68deccfe61a8bb /actionpack/lib/action_controller/layout.rb | |
| parent | b8fadd708b9850a77e1f64038763fffcff502499 (diff) | |
| parent | ed0e5640879fd42c00fc5900e0355a0ea1dcf2ad (diff) | |
| download | rails-da10673e32718d6a0619bd0f4b4d3d796db86a1a.tar.gz rails-da10673e32718d6a0619bd0f4b4d3d796db86a1a.tar.bz2 rails-da10673e32718d6a0619bd0f4b4d3d796db86a1a.zip | |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
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: |