Merge branch 'develop' into 1703-worker-splitting

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index d203cfd6b43b6458f8d8e1bf6aaef194f69d7ba3..b36c2ca2154e378bebb5629b3c38d1459c7dfe26 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -204,10 +204,10 @@ function discover_directory($search) {
        $j = json_decode($x);
 
        if (count($j->results)) {
-               foreach($j->results as $jj) {
+               foreach ($j->results as $jj) {
                        // Check if the contact already exists
                        $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
-                       if ($exists) {
+                       if (dbm::is_result($exists)) {
                                logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
 
                                if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND
@@ -260,12 +260,14 @@ function gs_search_user($search) {
        if (!$result["success"]) {
                return false;
        }
+
        $contacts = json_decode($result["body"]);
 
        if ($contacts->status == 'ERROR') {
                return false;
        }
-       foreach($contacts->data AS $user) {
+
+       foreach ($contacts->data AS $user) {
                $contact = probe_url($user->site_address."/".$user->name);
                if ($contact["network"] != NETWORK_PHANTOM) {
                        $contact["about"] = $user->description;