diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-29 14:07:15 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-29 14:07:15 -0800 |
| commit | 3e2adae95385295ca6dfe1c5ff1c36c18ca0aab2 (patch) | |
| tree | 38bb03c36b329d9bd075cc8c0f85302e66a63e84 /modules/user/models | |
| parent | 45cdac973d35de083875ed966ac687b805d60e7f (diff) | |
| parent | c4e360431564627003e4c7864b5dd5a07297e91e (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/user/models')
| -rw-r--r-- | modules/user/models/group.php | 2 | ||||
| -rw-r--r-- | modules/user/models/user.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/models/group.php b/modules/user/models/group.php index 851e72e6..82843ad1 100644 --- a/modules/user/models/group.php +++ b/modules/user/models/group.php @@ -37,7 +37,7 @@ class Group_Model extends ORM implements Group_Definition { /** * Specify our rules here so that we have access to the instance of this model. */ - public function validate($array=null) { + public function validate(Validation $array=null) { // validate() is recursive, only modify the rules on the outermost call. if (!$array) { $this->rules = array( diff --git a/modules/user/models/user.php b/modules/user/models/user.php index 78c31047..0cd634ea 100644 --- a/modules/user/models/user.php +++ b/modules/user/models/user.php @@ -62,7 +62,7 @@ class User_Model extends ORM implements User_Definition { /** * Specify our rules here so that we have access to the instance of this model. */ - public function validate($array=null) { + public function validate(Validation $array=null) { // validate() is recursive, only modify the rules on the outermost call. if (!$array) { $this->rules = array( |