X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=81494e7ebb4e15dbcc0e1f8f8fef0416dcef23b3;hb=a9f1f47be2d9f2bf97cc4cbe46789679bf5a42dd;hp=41981fe9e2042bc804004a1f70deac0b3a338d84;hpb=8aff8a76eb9efc4acaab0af3c8c0ca7a011f4349;p=friendica.git diff --git a/src/Model/Mail.php b/src/Model/Mail.php index 41981fe9e2..81494e7ebb 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -10,11 +10,10 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Network\Probe; -use Friendica\Util\Temporal; +use Friendica\Util\DateTimeFormat; use dba; require_once 'include/dba.php'; -require_once 'include/datetime.php'; /** * Class to handle private messages @@ -68,6 +67,7 @@ class Mail } } + $convuri = ''; if (!$convid) { // create a new conversation $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3); @@ -82,7 +82,7 @@ class Mail $handles = $recip_handle . ';' . $sender_handle; $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, - 'created' => Temporal::utcNow(), 'updated' => Temporal::utcNow(), + 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'subject' => $subject, 'recips' => $handles]; if (dba::insert('conv', $fields)) { $convid = dba::lastInsertId(); @@ -116,7 +116,7 @@ class Mail 'replied' => 0, 'uri' => $uri, 'parent-uri' => $replyto, - 'created' => Temporal::utcNow() + 'created' => DateTimeFormat::utcNow() ] ); @@ -196,7 +196,7 @@ class Mail $convid = null; $fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle, - 'created' => Temporal::utcNow(), 'updated' => Temporal::utcNow(), + 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'subject' => $subject, 'recips' => $handles]; if (dba::insert('conv', $fields)) { $convid = dba::lastInsertId(); @@ -224,7 +224,7 @@ class Mail 'replied' => 0, 'uri' => $uri, 'parent-uri' => $replyto, - 'created' => Temporal::utcNow(), + 'created' => DateTimeFormat::utcNow(), 'unknown' => 1 ] );