Default features should now work with the forumwidget again

diff --git a/include/features.php b/include/features.php
index ade93a18e3e4883fcf9996cc341af68566b6e923..f2a81fc6ec2d7fb33bfadd46081d1da6b9156104 100644 (file)
--- a/include/features.php
+++ b/include/features.php
@@ -16,14 +16,10 @@ use Friendica\Core\PConfig;
 function feature_enabled($uid, $feature) {
        $x = Config::get('feature_lock', $feature, false);
 
-       if (!$x) {
-               $x = PConfig::get($uid, 'feature', $feature, false);
-               if (!$x) {
-                       $x = Config::get('feature', $feature, false);
-                       if (!$x) {
-                               $x = get_feature_default($feature);
-                       }
-               }
+       if ($x === false) {
+               $x = get_feature_default($feature);
+               $x = Config::get('feature', $feature, $x);
+               $x = PConfig::get($uid, 'feature', $feature, $x);
        }
 
        $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
@@ -125,10 +121,9 @@ function get_features($filtered = true) {
                        $kquantity = count($arr[$k]);
                        for ($y = 0; $y < $kquantity; $y ++) {
                                if (is_array($arr[$k][$y])) {
-                                       if (!$arr[$k][$y][4]) {
+                                       if ($arr[$k][$y][4] === false) {
                                                $has_items = true;
-                                       }
-                                       else {
+                                       } else {
                                                unset($arr[$k][$y]);
                                        }
                                }