check the return value.

diff --git a/planetlab/common/adminsearch.php b/planetlab/common/adminsearch.php
index b47d6f3..37fbe56 100644 (file)
--- a/planetlab/common/adminsearch.php
+++ b/planetlab/common/adminsearch.php
@@ -87,8 +87,10 @@ function generic_search ($type,$field,$tokens) {
   }
   foreach ($tokens as $token) {
     $filter=array($field=>token_pattern($token));
-    $results = 
-      array_merge ($results,$api->$methodname($filter));
+    $new_results = $api->$methodname($filter);
+    if (is_array($new_results)) {
+        $results = array_merge ($results, $new_results);
+    }
   }
   return $results;
 }