Merge pull request #9411 from tobiasd/20201011-de

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 67d5d1ddca3371a9152ccce1bffe7ae3c369410d..12b4985526b9a9b137dfa7f07b84e36ce0f9e1d8 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -129,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;
                }