diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-28 15:25:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-28 15:25:29 -0700 |
| commit | e316494e06062f05c8026111dc1132fb6868bce5 (patch) | |
| tree | 82c221a92d6075bd38c16174bcb8187fb017181e /Zotlabs/Module/Pubstream.php | |
| parent | d3a5911932201eda2328123873d75e8c13cb9a89 (diff) | |
| parent | 4585e35b3e086638fa7a0c3832d80c57339a397e (diff) | |
| download | volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.tar.gz volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.tar.bz2 volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 28c34425c..fd19ca98e 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -7,10 +7,11 @@ require_once('include/conversation.php'); class Pubstream extends \Zotlabs\Web\Controller { function get($update = 0, $load = false) { + if($load) $_SESSION['loadtime'] = datetime_convert(); - + if(observer_prohibited(true)) { return login(); @@ -27,7 +28,9 @@ class Pubstream extends \Zotlabs\Web\Controller { if(! $update) { - $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0); + $_SESSION['static_loadtime'] = datetime_convert(); + + $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); $maxheight = get_config('system','home_divmore_height'); if(! $maxheight) |