aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Network.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-12-15 20:31:06 +0100
committerMario <mario@mariovavti.com>2018-12-15 20:31:06 +0100
commitcc66e1d96607c0f57036f0ba4505a128d695730b (patch)
treeb53a20631e34111243f9ae467cc4e89cc5bebd19 /Zotlabs/Module/Network.php
parent919ea9f750fbb665a655cd26ae86c00e424a4318 (diff)
parentde7cb6d6ad7902f28e63759350613ed4b30a055b (diff)
downloadvolse-hubzilla-cc66e1d96607c0f57036f0ba4505a128d695730b.tar.gz
volse-hubzilla-cc66e1d96607c0f57036f0ba4505a128d695730b.tar.bz2
volse-hubzilla-cc66e1d96607c0f57036f0ba4505a128d695730b.zip
Merge branch 'patch-20181214d' into 'dev'
Make Affinity Slider (optionally) 'sticky' across page loads. See merge request hubzilla/core!1429
Diffstat (limited to 'Zotlabs/Module/Network.php')
-rw-r--r--Zotlabs/Module/Network.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index b93faa612..d5cc06d09 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -132,6 +132,13 @@ class Network extends \Zotlabs\Web\Controller {
$deftag = '';
+ if (feature_enabled(local_channel(),'affinity')) {
+ $affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
+ if ($affinity_locked) {
+ set_pconfig(local_channel(),'affinity','cmin',$cmin);
+ set_pconfig(local_channel(),'affinity','cmax',$cmax);
+ }
+ }
if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
$nouveau = true;