Merge pull request #10860 from nupplaphil/feat/depository_profilefield

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 307724a2629dfbde29053155bd8c979f41fa7a10..75515c5df53c8166e5d0240ea570a4120f6525cf 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -74,9 +74,7 @@ class Mail
                        return false;
                }
 
-               if ($msg['reply']) {
-                       $reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]);
-
+               if ($msg['reply'] && DBA::isResult($reply = DBA::selectFirst('mail', ['uri', 'uri-id'], ['parent-uri' => $msg['parent-uri'], 'reply' => false]))) {
                        $msg['thr-parent']    = $reply['uri'];
                        $msg['thr-parent-id'] = $reply['uri-id'];
                } else {
@@ -173,7 +171,7 @@ class Mail
                        $recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
 
                        $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
-                       $sender_handle = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+                       $sender_handle = $a->getLoggedInUserNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
                        $conv_guid = System::createUUID();
                        $convuri = $recip_handle . ':' . $conv_guid;