Merge branch 'master' into 2.5

This commit is contained in:
mark_story 2014-03-25 21:30:56 -04:00
commit 381b3fc9c3

View file

@ -874,6 +874,7 @@ class Controller extends Object implements CakeEventListener {
* Returns number of errors in a submitted FORM. * Returns number of errors in a submitted FORM.
* *
* @return integer Number of errors * @return integer Number of errors
* @deprecated This method will be removed in 3.0
*/ */
public function validate() { public function validate() {
$args = func_get_args(); $args = func_get_args();
@ -892,6 +893,7 @@ class Controller extends Object implements CakeEventListener {
* *
* @param mixed A list of models as a variable argument * @param mixed A list of models as a variable argument
* @return array Validation errors, or false if none * @return array Validation errors, or false if none
* @deprecated This method will be removed in 3.0
*/ */
public function validateErrors() { public function validateErrors() {
$objects = func_get_args(); $objects = func_get_args();