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

gallery · Jan 29, 2010 · 3e2adae · 3e2adae
2 parents 45cdac9 + c4e3604
commit 3e2adae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
@@ -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(

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
@@ -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"))),

diff --git a/modules/user/models/group.php b/modules/user/models/group.php
@@ -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(

diff --git a/modules/user/models/user.php b/modules/user/models/user.php
@@ -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(