Handle ::find(NULL) on Group and User models.

application/modules/auth/models/GroupModel.php

@@ -5,7 +5,9 @@ class Auth_GroupModel extends Unl_Model
 	public static function find($id)
 	{
         if (Unl_Util::isArray($id) && count($id) == 0) {
-        	return new Unl_Model_Collection(__CLASS__);
+            return new Unl_Model_Collection(__CLASS__);
+        } else if ($id === NULL) {
+            return null;
         }
         
         $db = Zend_Registry::get('db');
@@ -62,6 +64,12 @@ class Auth_GroupModel extends Unl_Model
      */
 	static public function findByUser($user, $implicitMemberships = true)
 	{
+        if (Unl_Util::isArray($user) && count($user) == 0) {
+            return new Unl_Model_Collection(__CLASS__);
+        } else if ($user === NULL) {
+            return null;
+        }
+        
 		$db = Zend_Registry::get('db');
 		$select = new Zend_Db_Select($db);
 
@@ -139,6 +147,12 @@ class Auth_GroupModel extends Unl_Model
      */
     static public function findByChildGroup($group, $impliedMemberships = true)
     {
+        if (Unl_Util::isArray($group) && count($group) == 0) {
+            return new Unl_Model_Collection(__CLASS__);
+        } else if ($group === NULL) {
+            return null;
+        }
+        
         $db = Zend_Registry::get('db');
         $select = new Zend_Db_Select($db);
 
@@ -193,6 +207,12 @@ class Auth_GroupModel extends Unl_Model
      */
     static public function findByParentGroup($group, $impliedMemberships = true, $primaryGroups = false)
     {
+        if (Unl_Util::isArray($group) && count($group) == 0) {
+            return new Unl_Model_Collection(__CLASS__);
+        } else if ($group === NULL) {
+            return null;
+        }
+        
         $db = Zend_Registry::get('db');
         $select = new Zend_Db_Select($db);
 

application/modules/auth/models/UserModel.php

@@ -11,12 +11,11 @@ class Auth_UserModel extends Unl_Model {
     
     static public function find($id)
 	{
-		if (Unl_Util::isArray($id) && count($id) == 0) {
-			return new Unl_Model_Collection(__CLASS__);
-		}
-		if ($id === null) {
-			return null;
-		}
+        if (Unl_Util::isArray($id) && count($id) == 0) {
+            return new Unl_Model_Collection(__CLASS__);
+        } else if ($id === NULL) {
+            return null;
+        }
 		
 		$db = Zend_Registry::get('db');
 		
@@ -108,6 +107,12 @@ class Auth_UserModel extends Unl_Model {
      */
     static public function findByParentGroup($group, $impliedMemberships = true)
     {
+        if (Unl_Util::isArray($group) && count($group) == 0) {
+            return new Unl_Model_Collection(__CLASS__);
+        } else if ($group === NULL) {
+            return null;
+        }
+        
         $db = Zend_Registry::get('db');
         $select = new Zend_Db_Select($db);