diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-15 02:02:03 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-15 02:02:03 -0700 |
| commit | 2f3c3db02062fa867cb9b39ffcf11f646a9b80bb (patch) | |
| tree | b3da3d9c4160708201c093662e45844fd11eab91 /Zotlabs | |
| parent | 967d4da30a4d3d39a2bedddf2ac476a96707bc45 (diff) | |
| download | volse-hubzilla-2f3c3db02062fa867cb9b39ffcf11f646a9b80bb.tar.gz volse-hubzilla-2f3c3db02062fa867cb9b39ffcf11f646a9b80bb.tar.bz2 volse-hubzilla-2f3c3db02062fa867cb9b39ffcf11f646a9b80bb.zip | |
hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Network.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 2e9bcd2ce..a01425188 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -123,8 +123,8 @@ class Network extends \Zotlabs\Web\Controller { $def_acl = array('allow_gid' => '<' . $r[0]['hash'] . '>'); } - $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0); - $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99); + $default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1)); + $default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1)); $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); @@ -140,6 +140,7 @@ class Network extends \Zotlabs\Web\Controller { $deftag = ''; + if(x($_GET,'search') || $file || (!$pf && $cid)) $nouveau = true; @@ -420,8 +421,9 @@ class Network extends \Zotlabs\Web\Controller { $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); } - - if(($cmin != 0) || ($cmax != 99)) { + // cmin and cmax are both -1 when the affinity tool is disabled + + if(($cmin != (-1)) || ($cmax != (-1))) { // Not everybody who shows up in the network stream will be in your address book. // By default those that aren't are assumed to have closeness = 99; but this isn't |