From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Fri, 10 Jul 2009 09:58:39 +0000 (+0000)
Subject: check the return value.
X-Git-Tag: PLEWWW-4.3-25~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=7f0a00726a985eff3833590a7eed9615bc0067a7;p=plewww.git

check the return value.
---

diff --git a/planetlab/common/adminsearch.php b/planetlab/common/adminsearch.php
index b47d6f3..37fbe56 100644
--- 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;
 }