aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Notifications.php
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2021-01-20 13:15:40 +0100
committerMax Kostikov <max@kostikov.co>2021-01-20 13:15:40 +0100
commit9612a69a6448331ae3296503e97ef6ce204d9be1 (patch)
treeafae1ea1fa8c63db4c23836e0ebfe57b56b808ec /Zotlabs/Module/Notifications.php
parent308e94ea799b7851287fbc7635480ac13bfe3c61 (diff)
parent08264f8d11d349bbda92233d984ad52c16c6b2d6 (diff)
downloadvolse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.tar.gz
volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.tar.bz2
volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.zip
Merge branch 'dev' into 'dev'
Dev sync See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Module/Notifications.php')
-rw-r--r--Zotlabs/Module/Notifications.php8
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(