Merge pull request #5667 from miqrogroove/patch-1

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 971a91fa1244642d6e6ece4d9a889d577bd07a05..7052205e1706b57f55689a15865bbb40998efed9 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1597,12 +1597,9 @@ class OStatus
                }
 
                if (!DBA::isResult($r)) {
-                       $r = q(
-                               "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                               DBA::escape(normalise_link($url))
-                       );
+                       $gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]);
                        if (DBA::isResult($r)) {
-                               $contact = $r[0];
+                               $contact = $gcontact;
                                $contact["uid"] = -1;
                                $contact["success_update"] = $contact["updated"];
                        }
@@ -1803,14 +1800,11 @@ class OStatus
                        $item['follow'] = $contact['alias'];
                }
 
-               $r = q(
-                       "SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
-                       intval($owner['uid']),
-                       DBA::escape(normalise_link($contact["url"]))
-               );
+               $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])];
+               $user_contact = DBA::selectFirst('contact', ['id'], $condition);
 
-               if (DBA::isResult($r)) {
-                       $connect_id = $r[0]['id'];
+               if (DBA::isResult($user_contact)) {
+                       $connect_id = $user_contact['id'];
                } else {
                        $connect_id = 0;
                }