aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-01-30 18:04:53 +1100
committerGitHub <noreply@github.com>2017-01-30 18:04:53 +1100
commit15be542e56543b14d03ca0c90faecc620b9b6a28 (patch)
tree1522c841c9ad515e65a6e8384e6c5e5ac26632d4 /include
parenteebea700193155b176ee9a9b338f1a0ad4b6aa40 (diff)
parent17011a7637565839f4dde917568ca12daf87de66 (diff)
downloadvolse-hubzilla-15be542e56543b14d03ca0c90faecc620b9b6a28.tar.gz
volse-hubzilla-15be542e56543b14d03ca0c90faecc620b9b6a28.tar.bz2
volse-hubzilla-15be542e56543b14d03ca0c90faecc620b9b6a28.zip
Merge pull request #662 from anaqreon/affinity-settings
Affinity settings
Diffstat (limited to 'include')
-rw-r--r--include/widgets.php13
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')) {