1) Refactor App->config[] into Core\Config

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index d10deb2e88452ce94cbdf4704b35f98053a789ea..10a4f93aff7b0eae92bea1c3c29fc26d47221f20 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -29,7 +29,7 @@ function friendica_init(App $a)
                }
 
                $sql_extra = '';
-               if (!empty($a->config['admin_nickname'])) {
+               if (Config::getConfigValue('config', 'admin_nickname') !== null) {
                        $sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
                }
                if (!empty(Config::get('config', 'admin_email'))) {
@@ -48,8 +48,9 @@ function friendica_init(App $a)
 
                Config::load('feature_lock');
                $locked_features = [];
-               if (!empty($a->config['feature_lock'])) {
-                       foreach ($a->config['feature_lock'] as $k => $v) {
+               $featureLock = Config::getConfigValue('config', 'feature_lock');
+               if (isset($featureLock)) {
+                       foreach ($featureLock as $k => $v) {
                                if ($k === 'config_loaded') {
                                        continue;
                                }