Merge branch 'master' of https://github.com/friendica/red

2014-01-26 14:43:07 +01:00
parent 7b52295f8b 0948c3c3ca
commit 44658f7b7f
5 changed files with 27 additions and 5 deletions
--- 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']);