diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-30 15:05:10 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-30 15:05:10 -0800 |
| commit | aadbd5a92d83eb6d3e0ed33340e17150d0804563 (patch) | |
| tree | 63951af4f22ca111b8748acb6656bfa71db3219a /include | |
| parent | 7b065365e0d64a06ddfb7ade55e713a4b6a0f802 (diff) | |
| parent | d0827dbb3c61727deba6fa9c2df3718467274e55 (diff) | |
| download | volse-hubzilla-aadbd5a92d83eb6d3e0ed33340e17150d0804563.tar.gz volse-hubzilla-aadbd5a92d83eb6d3e0ed33340e17150d0804563.tar.bz2 volse-hubzilla-aadbd5a92d83eb6d3e0ed33340e17150d0804563.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/widgets.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/widgets.php b/include/widgets.php index 98ea4e6a1..27eae7d6f 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -521,9 +521,16 @@ function widget_affinity($arr) { if(! local_channel()) return ''; - - $cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : 0); - $cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : 99); + + // Get default cmin value from pconfig, but allow GET parameter to override + $cmin = intval(get_pconfig(local_channel(),'affinity','cmin')); + $cmin = (($cmin) ? $cmin : 0); + $cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $cmin); + + // Get default cmax value from pconfig, but allow GET parameter to override + $cmax = intval(get_pconfig(local_channel(),'affinity','cmax')); + $cmax = (($cmax) ? $cmax : 99); + $cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $cmax); if(feature_enabled(local_channel(),'affinity')) { |