Skip to content
Browse files

Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs

Fix exceptions messages in AC layouts
  • Loading branch information...
2 parents fa7a3aa + c16f4f1 commit fc6b961b09b2d057f5820ef2152f6cbf8acbfeea @drogus drogus committed Mar 16, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/abstract_controller/layouts.rb
View
4 actionpack/lib/abstract_controller/layouts.rb
@@ -311,7 +311,7 @@ def _write_layout_method
when false
nil
when true
- raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
+ raise ArgumentError, "Layouts must be specified as a String, Symbol, Proc, false, or nil"
when nil
name_clause
end
@@ -371,7 +371,7 @@ def _layout_for_option(name)
when false, nil then nil
else
raise ArgumentError,
- "String, true, or false, expected for `layout'; you passed #{name.inspect}"
+ "String, Proc, :default, true, or false, expected for `layout'; you passed #{name.inspect}"
end
end

0 comments on commit fc6b961

Please sign in to comment.
Something went wrong with that request. Please try again.