Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 063eafe67b90d3a1925f6571abb7325e9351c8e8..ab27dc667a72dd990516561f4ff9b87cebcb6a89 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -5,7 +5,7 @@ require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 require_once('mod/contacts.php');
 
-function common_content(&$a) {
+function common_content(App &$a) {
 
        $o = '';
 
@@ -48,8 +48,9 @@ function common_content(&$a) {
                $a->page['aside'] .= $vcard_widget;
        }
 
-       if(! count($c))
+       if (! dbm::is_result($c)) {
                return;
+       }
 
        if(! $cid) {
                if(get_my_url()) {
@@ -57,13 +58,13 @@ function common_content(&$a) {
                                dbesc(normalise_link(get_my_url())),
                                intval($profile_uid)
                        );
-                       if(count($r))
+                       if (dbm::is_result($r))
                                $cid = $r[0]['id'];
                        else {
                                $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
                                        dbesc(normalise_link(get_my_url()))
                                );
-                               if(count($r))
+                               if (dbm::is_result($r))
                                        $zcid = $r[0]['id'];
                        }
                }
@@ -94,13 +95,13 @@ function common_content(&$a) {
                $r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                return $o;
        }
 
        $id = 0;
 
-       foreach($r as $rr) {
+       foreach ($r as $rr) {
 
                //get further details of the contact
                $contact_details = get_contact_details_by_url($rr['url'], $uid);