From 6cb637e8abc94072fdae165d7a1b1af292f59685 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Nov 2017 11:31:07 +0000 Subject: [PATCH] Default features should now work with the forumwidget again --- include/features.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/include/features.php b/include/features.php index ade93a18e3..f2a81fc6ec 100644 --- 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]); } } -- 2.39.5