Don't cache account probing for empty networks

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 6e176f7123be313fabd1b161925601625b3dba07..433da08a88f61b5ca510687a71c1441fc5ad8983 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,6 +2,7 @@
 
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
+require_once('include/Smilies.php');
 
 function message_init(&$a) {
 
@@ -360,13 +361,13 @@ function message_content(&$a) {
                        dbesc($myprofile)
                );
 
-               if (is_filled_array($r)) {
+               if (dba::is_result($r)) {
                        $a->set_pager_total($r[0]['total']);
                }
 
                $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-               if(! is_filled_array($r)) {
+               if(! dba::is_result($r)) {
                        info( t('No messages.') . EOL);
                        return $o;
                }
@@ -462,13 +463,13 @@ function message_content(&$a) {
                        if($a->theme['template_engine'] === 'internal') {
                                $from_name_e = template_escape($message['from-name']);
                                $subject_e = template_escape($message['title']);
-                               $body_e = template_escape(smilies(bbcode($message['body'])));
+                               $body_e = template_escape(Smilies::replace(bbcode($message['body'])));
                                $to_name_e = template_escape($message['name']);
                        }
                        else {
                                $from_name_e = $message['from-name'];
                                $subject_e = $message['title'];
-                               $body_e = smilies(bbcode($message['body']));
+                               $body_e = Smilies::replace(bbcode($message['body']));
                                $to_name_e = $message['name'];
                        }