aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-13 15:55:04 -0800
committerzotlabs <mike@macgirvin.com>2018-01-13 15:55:04 -0800
commit75285fd452147aba7d2edf938d63c158384095b5 (patch)
treef3222b200936a1c5a907f6e987bb45d26e9ecc95 /Zotlabs/Module
parenteb3e43feec4e2de439de5398fcf498c0de5afbd4 (diff)
parentce10a44e722c9bbaceff64273641c3e08c6ad7a5 (diff)
downloadvolse-hubzilla-75285fd452147aba7d2edf938d63c158384095b5.tar.gz
volse-hubzilla-75285fd452147aba7d2edf938d63c158384095b5.tar.bz2
volse-hubzilla-75285fd452147aba7d2edf938d63c158384095b5.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Hq.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index ec3858471..a9c3bb8e2 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -51,8 +51,8 @@ class Hq extends \Zotlabs\Web\Controller {
if(! $item_hash) {
$r = q("SELECT mid FROM item
- WHERE uid = %d $item_normal
- AND item_unseen = 1
+ WHERE uid = %d
+ AND mid = parent_mid
ORDER BY created DESC LIMIT 1",
intval(local_channel())
);
@@ -135,7 +135,7 @@ class Hq extends \Zotlabs\Web\Controller {
$o = replace_macros(get_markup_template("hq.tpl"),
[
'$no_messages' => (($target_item) ? false : true),
- '$no_messages_label' => [ t('Welcome to Hubzilla!'), t('You have got no unseen activity...') ],
+ '$no_messages_label' => [ t('Welcome to Hubzilla!'), t('You have got no unseen posts...') ],
'$editor' => status_editor($a,$x)
]
);