Merge remote-tracking branch 'upstream/master'

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 88c0b938d63fb95143394131ccb35f5298330149..b8029fd03fa928eb27ea8942a6fd629d9dfa00a6 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -69,6 +69,9 @@ function notifications_content(&$a) {
 
        nav_set_selected('notifications');              
 
+       $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
+
+
        $o = '';
        $tabs = array(
                array(
@@ -211,7 +214,7 @@ function notifications_content(&$a) {
                }
                else
                        info( t('No introductions.') . EOL);
-               
+
                $o .= replace_macros($notif_tpl,array(
                        '$notif_header' => t('Notifications'),
                        '$tabs' => $tabs,
@@ -242,7 +245,7 @@ function notifications_content(&$a) {
                
                $notif_content = '';
                
-               if (count($r) > 0) {
+               if ($r) {
                        
                        foreach ($r as $it) {
                                switch($it['verb']){