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

actionpack/CHANGELOG

 *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]
 

actionpack/lib/action_controller/cgi_ext/cgi_methods.rb

@@ -192,9 +192,11 @@ def bind(key, value)
       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
-end
\ No newline at end of file
+end