diff options
| author | Mario <mario@mariovavti.com> | 2018-06-17 17:00:17 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-06-17 17:00:17 +0200 |
| commit | 28043726e64f750e646b42aa6f649e277fc3767e (patch) | |
| tree | 18a41bea6a4805454e0b1a2dacdfeda451854690 /Zotlabs/Module/Network.php | |
| parent | 9c5df51141d68e50d3c1f5d3097160408debce48 (diff) | |
| parent | 7e736c5359732647f5203bf2bb7fcd50c448fad9 (diff) | |
| download | volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.gz volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.bz2 volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 2e9bcd2ce..172157aab 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; @@ -334,8 +335,8 @@ class Network extends \Zotlabs\Web\Controller { '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => (($gid) ? $gid : '0'), '$cid' => (($cid) ? $cid : '0'), - '$cmin' => (($cmin) ? $cmin : '0'), - '$cmax' => (($cmax) ? $cmax : '0'), + '$cmin' => (($cmin) ? $cmin : '(-1)'), + '$cmax' => (($cmax) ? $cmax : '(-1)'), '$star' => (($star) ? $star : '0'), '$liked' => (($liked) ? $liked : '0'), '$conv' => (($conv) ? $conv : '0'), @@ -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 |