Permalink
Browse files

Merge branch 'master' of git@github.com:gallery/gallery3

  • Loading branch information...
2 parents 45cdac9 + c4e3604 commit 3e2adae95385295ca6dfe1c5ff1c36c18ca0aab2 @bharat bharat committed Jan 29, 2010
@@ -56,7 +56,7 @@ function author_url() {
/**
* Add some custom per-instance rules.
*/
- 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(
@@ -720,7 +720,7 @@ function descendants($limit=null, $offset=null, $where=array(), $order_by=null)
/**
* 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) {
if (!$array) {
$this->rules = array(
"album_cover_item_id" => array("callbacks" => array(array($this, "valid_album_cover"))),
@@ -37,7 +37,7 @@ public function users() {
/**
* 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(
@@ -62,7 +62,7 @@ public function groups() {
/**
* 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(

0 comments on commit 3e2adae

Please sign in to comment.