From 6b0bbc44bb0505c92e7a45ae6444a63e3d974edd Mon Sep 17 00:00:00 2001 From: jperras Date: Sun, 2 Aug 2009 19:12:02 +0000 Subject: [PATCH 1/2] Updating doc block for Object::requestAction. Fixes #6391. git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8273 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/object.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cake/libs/object.php b/cake/libs/object.php index 358fd759f..61c0896cd 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -77,9 +77,10 @@ class Object { /** * Calls a controller's method from any location. * - * @param string $url URL in the form of Cake URL ("/controller/method/parameter") + * @param mixed $url String or array-based url. * @param array $extra if array includes the key "return" it sets the AutoRender to true. - * @return mixed Success (true/false) or contents if 'return' is set in $extra + * @return mixed Boolean true or false on success/failure, or contents + * of rendered action if 'return' is set in $extra. * @access public */ function requestAction($url, $extra = array()) { From 3f46bf9568a5b8d0458ad757a060bbf3bedda97d Mon Sep 17 00:00:00 2001 From: jperras Date: Sun, 2 Aug 2009 19:18:54 +0000 Subject: [PATCH 2/2] Updating doc block for Model::invalidate. Fixes #4583. git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8274 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/model/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 58fa4c826..657aa61dc 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -2488,8 +2488,8 @@ class Model extends Overloadable { * rule (in case of multiple validation for field) that was broken. * * @param string $field The name of the field to invalidate - * @param mixed $value Name of validation rule that was not failed. If no validation key - * is provided, defaults to true. + * @param mixed $value Name of validation rule that was not failed, or validation message to + * be returned. If no validation key is provided, defaults to true. * @access public */ function invalidate($field, $value = true) {