diff options
| author | git-marijus <mario@mariovavti.com> | 2016-11-02 16:12:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 16:12:05 +0100 |
| commit | 5d3e04216d466e57dfeefe0319dd14b26e8487a2 (patch) | |
| tree | ef9651ccd33ef30f8208491db21ccef7cc6a4483 /Zotlabs/Module | |
| parent | 055d55b71b2430850f758378513e75e69fa27745 (diff) | |
| parent | ca948d66a901677665c7a5983dc438918d7fb1c9 (diff) | |
| download | volse-hubzilla-5d3e04216d466e57dfeefe0319dd14b26e8487a2.tar.gz volse-hubzilla-5d3e04216d466e57dfeefe0319dd14b26e8487a2.tar.bz2 volse-hubzilla-5d3e04216d466e57dfeefe0319dd14b26e8487a2.zip | |
Merge pull request #574 from zotlabs/static_update
feature: static page update as opposed to live update of conversation…
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 3 |
5 files changed, 10 insertions, 0 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index ef5399e75..e8bc53b5e 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -304,6 +304,7 @@ class Channel extends \Zotlabs\Web\Controller { '$nouveau' => '0', '$wall' => '1', '$fh' => '0', + '$static' => intval(feature_enabled(\App::$profile['profile_uid'],'static_updates')), '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), '$search' => '', '$order' => '', diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 3d3609ee0..42bb6fe14 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -130,6 +130,7 @@ class Display extends \Zotlabs\Web\Controller { if($load) $simple_update = ''; + $static = ((local_channel()) ? intval(feature_enabled(local_channel(),'static_updates')) : 0); if((! $update) && (! $load)) { @@ -154,6 +155,7 @@ class Display extends \Zotlabs\Web\Controller { '$fh' => '0', '$nouveau' => '0', '$wall' => '0', + '$static' => $static, '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$search' => '', diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 99573ad69..206761fc8 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -295,6 +295,7 @@ class Network extends \Zotlabs\Web\Controller { '$fh' => (($firehose) ? $firehose : '0'), '$nouveau' => (($nouveau) ? $nouveau : '0'), '$wall' => '0', + '$static' => intval(feature_enabled(local_channel(),'static_updates')), '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), '$search' => (($search) ? $search : ''), diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 312be7718..e354be8c3 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -21,6 +21,8 @@ class Pubstream extends \Zotlabs\Web\Controller { return; $item_normal = item_normal(); + + $static = ((local_channel()) ? intval(feature_enabled(local_channel(),'static_updates')) : 0); if(! $update) { @@ -49,6 +51,7 @@ class Pubstream extends \Zotlabs\Web\Controller { '$nouveau' => '0', '$wall' => '0', '$list' => '0', + '$static' => $static, '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), '$search' => '', '$order' => 'comment', diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 02f1d8bb6..796f95d6e 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -96,6 +96,8 @@ class Search extends \Zotlabs\Web\Controller { // OR your own posts if you are a logged in member // No items will be shown if the member has a blocked profile wall. + $static = ((local_channel()) ? intval(feature_enabled(local_channel(),'static_updates')) : 0); + if((! $update) && (! $load)) { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, @@ -120,6 +122,7 @@ class Search extends \Zotlabs\Web\Controller { '$fh' => '0', '$nouveau' => '0', '$wall' => '0', + '$static' => $static, '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), '$search' => (($tag) ? urlencode('#') : '') . $search, |