From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 27 Aug 2018 07:12:38 +0000 (+0200)
Subject: Merge pull request #5679 from annando/neverending-notices
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=df3b1be3b7437f3a36d6c1b6cf33cd2f0ad07388;hp=-c;p=friendica.git

Merge pull request #5679 from annando/neverending-notices

The neverending story of removing notices continues ...
---

df3b1be3b7437f3a36d6c1b6cf33cd2f0ad07388
diff --combined src/Network/Probe.php
index 408fd01dcb,33ced41054..af2d1c9a16
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@@ -934,9 -934,10 +934,10 @@@ class Prob
  
  		$prof_data = [];
  
- 		if (empty($data["addr"])) {
+ 		if (empty($data["addr"]) || empty($data["nick"])) {
  			$probe_data = self::uri($profile_link);
- 			$data["addr"] = $probe_data["addr"];
+ 			$data["addr"] = defaults($data, "addr", $probe_data["addr"]);
+ 			$data["nick"] = defaults($data, "nick", $probe_data["nick"]);
  		}
  
  		$prof_data["addr"]         = $data["addr"];
@@@ -1604,8 -1605,7 +1605,8 @@@
  		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
  
  		$condition = ["`uid` = ? AND `server` != ''", $uid];
 -		$mailacct = DBA::selectFirst('mailacct', ['pass', 'user'], $condition);
 +		$fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
 +		$mailacct = DBA::selectFirst('mailacct', $fields, $condition);
  
  		if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
  			return false;