Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 58748e289a70717b3cdbe35f0a2aad65cb2e8c1b..7ca45a21bd01e32baee60d3e235faa49afc76cb1 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -64,7 +64,7 @@ function contact_remove($id) {
        $r = q("select uid from contact where id = %d limit 1",
                intval($id)
        );
-       if((! count($r)) || (! intval($r[0]['uid'])))
+       if((! dbm::is_result($r)) || (! intval($r[0]['uid'])))
                return;
 
        $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
@@ -242,7 +242,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
                        FROM `gcontact` WHERE `nurl` = '%s'",
                                dbesc(normalise_link($url)));
 
-       if ($r) {
+       if (dbm::is_result($r)) {
                // If there is more than one entry we filter out the connector networks
                if (count($r) > 1) {
                        foreach ($r AS $id => $result) {
@@ -428,7 +428,7 @@ function random_profile() {
                        ORDER BY rand() LIMIT 1",
                dbesc(NETWORK_DFRN));
 
-       if(count($r))
+       if (dbm::is_result($r))
                return dirname($r[0]['url']);
        return '';
 }