Merge pull request #2902 from tobiasd/20161110-lng

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index ef5dce826ec5c62e3d54007ea25802d2ef49cca8..4bd73d0cee9d36da73e625d467457843d4a4fe2a 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -9,7 +9,7 @@ function message_init(&$a) {
        $tabs = '';
 
        if ($a->argc >1 && is_numeric($a->argv[1])) {
-        $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
+               $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
        }
 
        $new = array(
@@ -373,11 +373,13 @@ function message_content(&$a) {
                        intval(local_user())
                );
 
-               if(count($r)) $a->set_pager_total($r[0]['total']);
+               if (dbm::is_result($r)) {
+                       $a->set_pager_total($r[0]['total']);
+               }
 
                $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        info( t('No messages.') . EOL);
                        return $o;
                }
@@ -562,7 +564,7 @@ function get_messages($user, $lstart, $lend) {
        );
 }
 
-function render_messages($msg, $t) {
+function render_messages(array $msg, $t) {
 
        $a = get_app();