Merge pull request #4312 from zeroadam/feature/L10n

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index f1021bb7722b95cc99aa6a930e206339c4038dda..be68f515f1c20c92dc75e844774c6a86f7063626 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -5,6 +5,7 @@
 namespace Friendica\Model;
 
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
@@ -35,7 +36,7 @@ class Mail
                }
 
                if (!strlen($subject)) {
-                       $subject = t('[no subject]');
+                       $subject = L10n::t('[no subject]');
                }
 
                $me = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
@@ -67,10 +68,10 @@ class Mail
 
                if (!$convid) {
                        // create a new conversation
-                       $recip_host = substr($contact[0]['url'], strpos($contact[0]['url'], '://') + 3);
+                       $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3);
                        $recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
 
-                       $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
+                       $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
                        $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
                        $conv_guid = get_guid(32);
@@ -102,9 +103,9 @@ class Mail
                                'uid' => local_user(),
                                'guid' => $guid,
                                'convid' => $convid,
-                               'from-name' => $me[0]['name'],
-                               'from-photo' => $me[0]['thumb'],
-                               'from-url' => $me[0]['url'],
+                               'from-name' => $me['name'],
+                               'from-photo' => $me['thumb'],
+                               'from-url' => $me['url'],
                                'contact-id' => $recipient,
                                'title' => $subject,
                                'body' => $body,
@@ -168,7 +169,7 @@ class Mail
                }
 
                if (!strlen($subject)) {
-                       $subject = t('[no subject]');
+                       $subject = L10n::t('[no subject]');
                }
 
                $guid = get_guid(32);