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 b56b65f72c2ae17630ba8efafc2b60213de68cce..24a174b6b58251df7c5dd674c4ad75d207c50b46 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -9,7 +9,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
@@ -57,13 +56,11 @@ class Mail
 
                if (strlen($replyto)) {
                        $reply = true;
-                       $r = q("SELECT `convid` FROM `mail` WHERE `uid` = %d AND (`uri` = '%s' OR `parent-uri` = '%s') LIMIT 1",
-                               intval(local_user()),
-                               dbesc($replyto),
-                               dbesc($replyto)
-                       );
-                       if (DBM::is_result($r)) {
-                               $convid = $r[0]['convid'];
+                       $condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)",
+                               local_user(), $replyto, $replyto];
+                       $mail = DBA::selectFirst('mail', ['convid'], $condition);
+                       if (DBA::isResult($mail)) {
+                               $convid = $mail['convid'];
                        }
                }