diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-26 14:43:07 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-26 14:43:07 +0100 |
| commit | 44658f7b7f03979c3809b046d911ff24484a05c9 (patch) | |
| tree | 35319a273306c37746d8a9808e34dd004717b2d9 /include/features.php | |
| parent | 7b52295f8bc279dc836fb32b76cc09da164fbf0b (diff) | |
| parent | 0948c3c3ca5aa3621247c7a77a05ac5acd085459 (diff) | |
| download | volse-hubzilla-44658f7b7f03979c3809b046d911ff24484a05c9.tar.gz volse-hubzilla-44658f7b7f03979c3809b046d911ff24484a05c9.tar.bz2 volse-hubzilla-44658f7b7f03979c3809b046d911ff24484a05c9.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/features.php')
| -rw-r--r-- | include/features.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php index efdf6dc3a..973fe9fe7 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']); |