diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-13 15:54:45 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-13 15:54:45 -0800 |
| commit | 76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f (patch) | |
| tree | fb5d58779c5f4984a2e9cf354e154e06c997c1c9 /Zotlabs | |
| parent | e8958b1fb85ebcc4c51632a2de746b9aec6f354e (diff) | |
| parent | ce10a44e722c9bbaceff64273641c3e08c6ad7a5 (diff) | |
| download | volse-hubzilla-76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f.tar.gz volse-hubzilla-76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f.tar.bz2 volse-hubzilla-76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Hq.php | 6 |
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) ] ); |