Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events

[friendica.git] / include / update_gcontact.php

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index d90b98711b03159b8402d190a93ea96366769b37..97c825352eb26919930ea92c99727077875389d9 100644 (file)
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,11 +1,11 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function update_gcontact_run(&$argv, &$argc) {
        global $a;
 
-       require_once 'include/Scrape.php';
+       require_once 'include/probe.php';
        require_once 'include/socgraph.php';
 
        logger('update_gcontact: start');
@@ -21,11 +21,11 @@ function update_gcontact_run(&$argv, &$argc) {
 
        $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-       if (!dbm::_is_result($r)) {
+       if (!dbm::is_result($r)) {
                return;
        }
 
-       if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+       if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
                return;
        }
 
@@ -40,16 +40,16 @@ function update_gcontact_run(&$argv, &$argc) {
                return;
        }
 
-       if (($data["name"] == "") AND ($r[0]['name'] != ""))
+       if (($data["name"] == "") && ($r[0]['name'] != ""))
                $data["name"] = $r[0]['name'];
 
-       if (($data["nick"] == "") AND ($r[0]['nick'] != ""))
+       if (($data["nick"] == "") && ($r[0]['nick'] != ""))
                $data["nick"] = $r[0]['nick'];
 
-       if (($data["addr"] == "") AND ($r[0]['addr'] != ""))
+       if (($data["addr"] == "") && ($r[0]['addr'] != ""))
                $data["addr"] = $r[0]['addr'];
 
-       if (($data["photo"] == "") AND ($r[0]['photo'] != ""))
+       if (($data["photo"] == "") && ($r[0]['photo'] != ""))
                $data["photo"] = $r[0]['photo'];