Get the correct parts of email addresses

Fixes #17
AJenbo · Jun 18, 2018 · a08b413 · a08b413
1 parent d5e0226
commit a08b413
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/application/inc/Models/Email.php b/application/inc/Models/Email.php
@@ -245,12 +245,12 @@ public function getRecipientAddress(): string
     public static function mapFromDB(array $data): array
     {
         $data['from'] = explode('<', $data['from']);
-        $senderName = trim($data['from'][0]);
-        $senderAddress = mb_substr($data['from'][1], 0, -1);
+        $senderAddress = trim($data['from'][0]);
+        $senderName = mb_substr($data['from'][1], 0, -1);
 
         $data['to'] = explode('<', $data['to']);
-        $recipientName = trim($data['to'][0]);
-        $recipientAddress = mb_substr($data['to'][1], 0, -1);
+        $recipientAddress = trim($data['to'][0]);
+        $recipientName = mb_substr($data['to'][1], 0, -1);
 
         return [
             'id'               => $data['id'],