Merge branch 'develop' of https://github.com/friendica/friendica into develop

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index f9b4c4d6dbddba324d2b4c84d9a47160ca28b4b7..81494e7ebb4e15dbcc0e1f8f8fef0416dcef23b3 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -14,7 +14,6 @@ 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);