COmanage Developers List

Author: marie
Date: 2012-02-16 01:09:50 -0500 (Thu, 16 Feb 2012)
New Revision: 225

Modified:
   registry/trunk/app/Model/Cou.php
Log:
co-248

Modified: registry/trunk/app/Model/Cou.php
===================================================================
--- registry/trunk/app/Model/Cou.php    2012-02-15 16:18:08 UTC (rev 224)
+++ registry/trunk/app/Model/Cou.php    2012-02-16 06:09:50 UTC (rev 225)
@@ -144,13 +144,19 @@
 
     // Get children
     $allChildren = array();
-    foreach($parentData as $parent)
+    if($parentData != NULL)
     {
-      $allChildren = array_merge($allChildren, $this->children($parent, 
false, 'name'));
+      foreach($parentData as $parent)
+      {
+        $allChildren = array_merge($allChildren, $this->children($parent, 
false, 'name'));
+      }
     }
     $allChildren = Set::extract($allChildren, '{n}.Cou.name');
 
-    return(array_merge($parentCou, $allChildren));
+    if($allChildren != NULL)
+      return(array_merge($parentCou, $allChildren));
+    else
+      return($parentCou);
   }
 
   /**