X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=12b4985526b9a9b137dfa7f07b84e36ce0f9e1d8;hb=8c328a3c60d3bcbc8b091158383bf829064d2c9c;hp=405635215197f48de88b6a9473c8c802908922e2;hpb=390f6be42ea9f71be3e1abd7eeb4b32b0c674c37;p=friendica.git

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 4056352151..12b4985526 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -27,7 +27,6 @@ use Friendica\Core\Worker;
 use Friendica\DI;
 use Friendica\Database\DBA;
 use Friendica\Model\Notify\Type;
-use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
@@ -130,9 +129,12 @@ class Mail
 		}
 
 		$me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
-		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		if (!DBA::isResult($me)) {
+			return -2;
+		}
 
-		if (!(count($me) && (count($contact)))) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		if (!DBA::isResult($contact)) {
 			return -2;
 		}
 
@@ -267,7 +269,7 @@ class Mail
 		$guid = System::createUUID();
 		$uri = Item::newURI(local_user(), $guid);
 
-		$me = Probe::uri($replyto);
+		$me = Contact::getByURL($replyto);
 		if (!$me['name']) {
 			return -2;
 		}