diff options
| author | Andrew Manning <tamanning@zoho.com> | 2017-01-30 06:03:53 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2017-01-30 06:03:53 -0500 |
| commit | fab103524ab2b171d36c6f3830da682b0768627f (patch) | |
| tree | 9deadb7596933054a4ae1f24dbbb04f71a8c8e87 /include/widgets.php | |
| parent | b58d56826bf9fd74a70a25848113c80baeeb8dfc (diff) | |
| parent | 15be542e56543b14d03ca0c90faecc620b9b6a28 (diff) | |
| download | volse-hubzilla-fab103524ab2b171d36c6f3830da682b0768627f.tar.gz volse-hubzilla-fab103524ab2b171d36c6f3830da682b0768627f.tar.bz2 volse-hubzilla-fab103524ab2b171d36c6f3830da682b0768627f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include/widgets.php')
| -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')) { |