diff options
author | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
commit | 8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c (patch) | |
tree | 04add36aa35ce8cda58c5594a783737b25346175 /Zotlabs/Module/Pubstream.php | |
parent | 4d3b0577c9538644ca0eeb2751b285521d2cc86d (diff) | |
parent | 866dc9a9b3ca1cd98fc032afe0aec14ccdb86ba0 (diff) | |
download | volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.gz volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.bz2 volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.zip |
Merge branch 'master' into tagging
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
-rw-r--r-- | Zotlabs/Module/Pubstream.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index ef818845c..72d5f80fa 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -28,6 +28,8 @@ class Pubstream extends \Zotlabs\Web\Controller { if(! $update) { + nav_set_selected(t('Public Stream')); + $_SESSION['static_loadtime'] = datetime_convert(); $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); @@ -108,7 +110,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $simple_update = ''; if($static && $simple_update) - $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; + $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; //logger('update: ' . $update . ' load: ' . $load); |