Merge pull request #8226 from nupplaphil/bug/wait_for_conn

[friendica.git] / src / Model / GContact.php

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index b029cd40d142d2e4bba28957a71591fea8345cb2..05f20ec5b8063822cced6ea70aa276b838135f3f 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
 use DOMDocument;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -903,7 +902,7 @@ class GContact
                $curlResult = Network::curl($data['poll']);
                if (!$curlResult->isSuccess()) {
                        $fields = ['last_failure' => DateTimeFormat::utcNow()];
-                       DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($profile)]);
+                       DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
 
                        Logger::info("Profile wasn't reachable (no feed)", ['url' => $data['url']]);
                        return;
@@ -1118,7 +1117,7 @@ class GContact
                );
 
                $gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'],
-                               'gender' => $userdata['gender'], 'keywords' => $userdata['pub_keywords'],
+                               'gender' => '', 'keywords' => $userdata['pub_keywords'],
                                'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
                                "notify" => $userdata['notify'], 'url' => $userdata['url'],
                                "hide" => ($userdata['hidewall'] || !$userdata['net-publish']),