diff options
author | mjfriaza <mjfriaza@noreply.codeberg.org> | 2021-02-18 13:28:05 +0100 |
---|---|---|
committer | mjfriaza <mjfriaza@noreply.codeberg.org> | 2021-02-18 13:28:05 +0100 |
commit | 655ae9d1cdaa940bb7861eb34f4f489a636879b2 (patch) | |
tree | 0a10c3d602f5da23dca56ac1360c3ee98282e079 /Zotlabs/Module/Notifications.php | |
parent | 76163fc37b76570e158ab32d53a1c0e0cc298bad (diff) | |
parent | 08c9152abdfa90da09931bdcc6e6c81ea243434c (diff) | |
download | volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.tar.gz volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.tar.bz2 volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.zip |
Merge branch 'dev' into dev
Diffstat (limited to 'Zotlabs/Module/Notifications.php')
-rw-r--r-- | Zotlabs/Module/Notifications.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php index 1762ad5f6..55268e0a2 100644 --- a/Zotlabs/Module/Notifications.php +++ b/Zotlabs/Module/Notifications.php @@ -19,7 +19,7 @@ class Notifications extends \Zotlabs\Web\Controller { $r = q("select count(*) as total from notify where uid = %d and seen = 0", intval(local_channel()) ); - if($r && intval($t[0]['total']) > 49) { + if($r && intval($r[0]['total']) > 49) { $r = q("select * from notify where uid = %d and seen = 0 order by created desc limit 50", intval(local_channel()) @@ -32,7 +32,7 @@ class Notifications extends \Zotlabs\Web\Controller { $r2 = q("select * from notify where uid = %d and seen = 1 order by created desc limit %d", intval(local_channel()), - intval(50 - intval($t[0]['total'])) + intval(50 - intval($r[0]['total'])) ); $r = array_merge($r1,$r2); } @@ -41,7 +41,7 @@ class Notifications extends \Zotlabs\Web\Controller { $notifications_available = 1; foreach ($r as $rr) { $x = strip_tags(bbcode($rr['msg'])); - $notif_content .= replace_macros(get_markup_template('notify.tpl'),array( + $notif_content = replace_macros(get_markup_template('notify.tpl'),array( '$item_link' => z_root().'/notify/view/'. $rr['id'], '$item_image' => $rr['photo'], '$item_text' => $x, @@ -52,7 +52,7 @@ class Notifications extends \Zotlabs\Web\Controller { } } else { - $notif_content .= t('No more system notifications.'); + $notif_content = t('No more system notifications.'); } $o .= replace_macros(get_markup_template('notifications.tpl'),array( |