Move Config::load() to DI::config()->load()

diff --git a/bin/daemon.php b/bin/daemon.php
index f0154e74e8dcef2242d05bd16b3619fd30f987fb..7c5e01c41d2b1410061b20dea95133476f6d2161 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -44,7 +44,7 @@ if (DI::mode()->isInstall()) {
        die("Friendica isn't properly installed yet.\n");
 }
 
-Config::load();
+DI::config()->load();
 
 if (empty(Config::get('system', 'pidfile'))) {
        die(<<<TXT

diff --git a/src/Core/Config.php b/src/Core/Config.php
index 83889f115fda3f141848b6eb02771471dce07076..efcaab66fe7b98b7ae3dd4dcb2f41f4787a9c7ac 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -19,18 +19,6 @@ use Friendica\DI;
  */
 class Config
 {
-       /**
-        * Loads all configuration values of family into a cached storage.
-        *
-        * @param string $cat The category of the configuration value
-        *
-        * @return void
-        */
-       public static function load($cat = "config")
-       {
-               DI::config()->load($cat);
-       }
-
        /**
         * Get a particular user's config variable given the category name ($family) and a key.
         *

diff --git a/src/Core/Update.php b/src/Core/Update.php
index b416f207af728b233da74cb61ebaeb1e52d375ea..e1bcc46d4fa0a10d613a12f98e76d7b75387c94e 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -90,7 +90,7 @@ class Update
                        $stored = intval($build);
                        $current = intval(DB_UPDATE_VERSION);
                        if ($stored < $current || $force) {
-                               Config::load('database');
+                               DI::config()->load('database');
 
                                Logger::info('Update starting.', ['from' => $stored, 'to' => $current]);
 

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 363f7cd44deb827ebaab84acfd59f1b81c2b3463..cf27e39156295de17cb871e3b6986e685993e335 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -14,7 +14,7 @@ $schemecss = '';
 $schemecssfile = false;
 $scheme_modified = 0;
 
-Config::load('frio');
+DI::config()->load('frio');
 
 // Default to hard-coded values for empty settings
 $scheme           = Config::get('frio', 'scheme', Config::get('frio', 'schema'));