aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorMichael Meer <michael@meer.name>2014-01-27 10:37:15 +0100
committerMichael Meer <michael@meer.name>2014-01-27 10:37:15 +0100
commita3bf272753183f61723fea5dccd52abe6f0662dd (patch)
tree70a7e3a2e4ed5544abbddb8ee73226b638c01099 /mod/settings.php
parent844df110586e6726581c620754fef5419f6bea5e (diff)
parentd67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e (diff)
downloadvolse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.gz
volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.bz2
volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.zip
Merge branch 'master' of https://github.com/MicMee/red
to be in sync
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php2
1 files changed, 1 insertions, 1 deletions
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')));
}
}