From 5d294e8be8da11bff43cc78d2aa207d75bd76df9 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Sun, 19 Jan 2020 21:20:10 +0100
Subject: [PATCH] Move Config::load() to DI::config()->load()

---
 bin/daemon.php            |  2 +-
 src/Core/Config.php       | 12 ------------
 src/Core/Update.php       |  2 +-
 view/theme/frio/style.php |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/bin/daemon.php b/bin/daemon.php
index f0154e74e8..7c5e01c41d 100755
--- 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 83889f115f..efcaab66fe 100644
--- 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 b416f207af..e1bcc46d4f 100644
--- 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 363f7cd44d..cf27e39156 100644
--- 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'));