More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / mod / notify.php

diff --git a/mod/notify.php b/mod/notify.php
index 7c367708bb224ce838008b22401170c2317f9d4b..dceb326a4bdd260faa34824d2350edfac52f8ab6 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,9 +1,9 @@
 <?php
 require_once('include/NotificationsManager.php');
-if(! function_exists('notify_init')) {
+
+
 function notify_init(&$a) {
        if(! local_user()) return;
-
        $nm = new NotificationsManager();
                
        if($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
@@ -33,10 +33,9 @@ function notify_init(&$a) {
                echo $j;
                killme();
        }
-}
+
 }
 
-if(! function_exists('notify_content')) {
 function notify_content(&$a) {
        if(! local_user()) return login();
 
@@ -48,7 +47,7 @@ function notify_content(&$a) {
        require_once('include/bbcode.php');
 
        $r = $nm->getAll(array('seen'=>0));
-       if ($r!==false && count($r) > 0) {
+       if (dbm::is_result($r) > 0) {
                foreach ($r as $it) {
                        $notif_content .= replace_macros($not_tpl,array(
                                '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
@@ -69,6 +68,5 @@ function notify_content(&$a) {
 
        return $o;
 
-}
-}
 
+}