Good looking and better performance

diff --git a/include/features.php b/include/features.php
index f2a81fc6ec2d7fb33bfadd46081d1da6b9156104..4e9e7d9d950c685d8f37943de804e35d8ea215ae 100644 (file)
--- a/include/features.php
+++ b/include/features.php
@@ -16,10 +16,14 @@ use Friendica\Core\PConfig;
 function feature_enabled($uid, $feature) {
        $x = Config::get('feature_lock', $feature, false);
 
+       if ($x === false) {
+               $x = PConfig::get($uid, 'feature', $feature, false);
+       }
+       if ($x === false) {
+               $x = Config::get('feature', $feature, false);
+       }
        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);