Add support for legacy $lang config in App->loadConfig

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index b2e9e1a48734770b4b2ec5a0b9fcf05287eb0eda..f10ad368ba4b02052d26c009975ee4fa4e803944 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -47,7 +47,7 @@ class Mail
                        return -2;
                }
 
-               $guid = get_guid(32);
+               $guid = System::createGUID(32);
                $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
                $convid = 0;
@@ -67,6 +67,7 @@ class Mail
                        }
                }
 
+               $convuri = '';
                if (!$convid) {
                        // create a new conversation
                        $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3);
@@ -75,7 +76,7 @@ class Mail
                        $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);
+                       $conv_guid = System::createGUID(32);
                        $convuri = $recip_handle . ':' . $conv_guid;
 
                        $handles = $recip_handle . ';' . $sender_handle;
@@ -173,7 +174,7 @@ class Mail
                        $subject = L10n::t('[no subject]');
                }
 
-               $guid = get_guid(32);
+               $guid = System::createGUID(32);
                $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
                $me = Probe::uri($replyto);
@@ -182,7 +183,7 @@ class Mail
                        return -2;
                }
 
-               $conv_guid = get_guid(32);
+               $conv_guid = System::createGUID(32);
 
                $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);