diff options
author | zotlabs <mike@macgirvin.com> | 2018-12-17 18:45:42 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-12-17 18:45:42 -0800 |
commit | 15ce8bc79b219e10f709796c09c739649a8df53b (patch) | |
tree | edd456a39ad0daf12d6cc4409a99477f4fb38d82 /Zotlabs/Module/Network.php | |
parent | 8d70b919551f6f6462e639f7cfffda9825344e43 (diff) | |
parent | d190b1995b0886b430beb5dac1a1e72582b9ad2b (diff) | |
download | volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.gz volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.bz2 volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Network.php')
-rw-r--r-- | Zotlabs/Module/Network.php | 7 |
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; |