diff options
| author | Michael Meer <michael@meer.name> | 2014-01-27 10:37:15 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-27 10:37:15 +0100 |
| commit | a3bf272753183f61723fea5dccd52abe6f0662dd (patch) | |
| tree | 70a7e3a2e4ed5544abbddb8ee73226b638c01099 /include/features.php | |
| parent | 844df110586e6726581c620754fef5419f6bea5e (diff) | |
| parent | d67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e (diff) | |
| download | volse-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 '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 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']); |