This merge brings back dbm::is_result() where I could find it.

[friendica.git] / view / theme / vier / theme.php

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7f6ead079f4d9abce62e964edf297f375e260bb5..9cdd396fd1b69f6f80f773dd54360309754f08d8 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -19,8 +19,6 @@ function vier_init(&$a) {
 
        set_template_engine($a, 'smarty3');
 
-       $a->theme_info = array();
-
        if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) {
                vier_community_info();
 
@@ -149,7 +147,7 @@ function vier_community_info() {
                $r = suggestion_query(local_user(), 0, 9);
 
                $tpl = get_markup_template('ch_directory_item.tpl');
-               if(count($r)) {
+               if(dbm::is_result($r)) {
 
                        $aside['$comunity_profiles_title'] = t('Community Profiles');
                        $aside['$comunity_profiles_items'] = array();
@@ -172,13 +170,14 @@ function vier_community_info() {
                $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
                $order = " ORDER BY `register_date` DESC ";
 
+               $tpl = get_markup_template('ch_directory_item.tpl');
+
                $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
                                FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                                WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
                                0, 9);
 
-               $tpl = get_markup_template('ch_directory_item.tpl');
-               if(count($r)) {
+               if(dbm::is_result($r)) {
 
                        $aside['$lastusers_title'] = t('Last users');
                        $aside['$lastusers_items'] = array();
@@ -369,7 +368,7 @@ function vier_community_info() {
 
                $tpl = get_markup_template('ch_connectors.tpl');
 
-               if(count($r)) {
+               if(dbm::is_result($r)) {
 
                        $con_services = array();
                        $con_services['title'] = Array("", t('Connect Services'), "", "");