Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 6be1f16de0298fcd589dc49353b436db9aa99858..6ae458b6a21cc2a9abed43d741797deeaf659c1d 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,7 +2,7 @@
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
-function viewcontacts_init(&$a) {
+function viewcontacts_init(App &$a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                return;
@@ -16,8 +16,9 @@ function viewcontacts_init(&$a) {
                        dbesc($nick)
                );
 
-               if(! count($r))
+               if (! dbm::is_result($r)) {
                        return;
+               }
 
                $a->data['user'] = $r[0];
                $a->profile_uid = $r[0]['uid'];
@@ -28,7 +29,7 @@ function viewcontacts_init(&$a) {
 }
 
 
-function viewcontacts_content(&$a) {
+function viewcontacts_content(App &$a) {
        require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -54,7 +55,7 @@ function viewcontacts_content(&$a) {
                dbesc(NETWORK_DIASPORA),
                dbesc(NETWORK_OSTATUS)
        );
-       if(count($r))
+       if (dbm::is_result($r))
                $a->set_pager_total($r[0]['total']);
 
        $r = q("SELECT * FROM `contact`
@@ -68,7 +69,7 @@ function viewcontacts_content(&$a) {
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
-       if(!count($r)) {
+       if (!dbm::is_result($r)) {
                info(t('No contacts.').EOL);
                return $o;
        }