diff options
| author | friendica <info@friendica.com> | 2014-01-26 03:27:36 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-26 03:27:36 -0800 |
| commit | 0948c3c3ca5aa3621247c7a77a05ac5acd085459 (patch) | |
| tree | b05c52358360563cbc4945c42461d73bd0de3f3b | |
| parent | f90b3b60cb04b63386c9d16eb8dcb6530df979a0 (diff) | |
| download | volse-hubzilla-0948c3c3ca5aa3621247c7a77a05ac5acd085459.tar.gz volse-hubzilla-0948c3c3ca5aa3621247c7a77a05ac5acd085459.tar.bz2 volse-hubzilla-0948c3c3ca5aa3621247c7a77a05ac5acd085459.zip | |
allow site defaults for enabled features
| -rw-r--r-- | include/features.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/features.php b/include/features.php index 1f83eb319..cc8d457bc 100644 --- a/include/features.php +++ b/include/features.php @@ -7,6 +7,8 @@ function feature_enabled($uid,$feature) { $x = get_pconfig($uid,'feature',$feature); + if($x === false) + $x = get_config('feature',$feature); $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x); call_hooks('feature_enabled',$arr); return($arr['enabled']); diff --git a/mod/settings.php b/mod/settings.php index 5aa018cc2..ee6ef45de 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -635,7 +635,7 @@ function settings_content(&$a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach(array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); } } |