Permalink
Browse files

Fix exceptions messages in AC layouts

  • Loading branch information...
1 parent a39ee47 commit c16f4f1f38c8d209379cfec45b259538aba61c7c @avakhov avakhov committed Mar 10, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/abstract_controller/layouts.rb
@@ -304,7 +304,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
@@ -364,7 +364,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 c16f4f1

Please sign in to comment.