mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Update descriptive messages for exceptions thrown by cgi_methods. Closes #6103.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5070 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
8d9e6609f8
commit
f1b639cffb
2 changed files with 6 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
|||
*SVN*
|
||||
|
||||
* Add descriptive messages to the exceptions thrown by cgi_methods. Closes #6091. [Nicholas Seckar]
|
||||
* Add descriptive messages to the exceptions thrown by cgi_methods. #6091, #6103 [Nicholas Seckar, Bob Silva]
|
||||
|
||||
* Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids, #6068 [petermichaux@gmail.com]
|
||||
|
||||
|
|
|
@ -192,8 +192,10 @@ class CGIMethods #:nodoc:
|
|||
end
|
||||
|
||||
def type_conflict!(klass, value)
|
||||
raise TypeError, "Conflicting types for parameter containers
|
||||
Expected an instance of #{klass}, but found found one of #{value.class}"
|
||||
raise TypeError,
|
||||
"Conflicting types for parameter containers. " +
|
||||
"Expected an instance of #{klass}, but found an instance of #{value.class}. " +
|
||||
"This can be caused by passing Array and Hash based paramters qs[]=value&qs[key]=value. "
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue