friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
Philipp Holzer 2020-01-19 21:20:10 +01:00
parent 1bc4b2e078
commit 5d294e8be8
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/daemon.php
View File

@ -44,7 +44,7 @@ if (DI::mode()->isInstall()) {
die("Friendica isn't properly installed yet.\n"); die("Friendica isn't properly installed yet.\n");
} }
Config::load(); DI::config()->load();
if (empty(Config::get('system', 'pidfile'))) { if (empty(Config::get('system', 'pidfile'))) {
die(<<<TXT die(<<<TXT

12
src/Core/Config.php
View File

@ -19,18 +19,6 @@ use Friendica\DI;
*/ */
class Config 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. * Get a particular user's config variable given the category name ($family) and a key.
* *

2
src/Core/Update.php
View File

@ -90,7 +90,7 @@ class Update
$stored = intval($build); $stored = intval($build);
$current = intval(DB_UPDATE_VERSION); $current = intval(DB_UPDATE_VERSION);
if ($stored < $current || $force) { if ($stored < $current || $force) {
Config::load('database'); DI::config()->load('database');
Logger::info('Update starting.', ['from' => $stored, 'to' => $current]); Logger::info('Update starting.', ['from' => $stored, 'to' => $current]);

2
view/theme/frio/style.php
View File

@ -14,7 +14,7 @@ $schemecss = '';
$schemecssfile = false; $schemecssfile = false;
$scheme_modified = 0; $scheme_modified = 0;
Config::load('frio'); DI::config()->load('frio');
// Default to hard-coded values for empty settings // Default to hard-coded values for empty settings
$scheme = Config::get('frio', 'scheme', Config::get('frio', 'schema')); $scheme = Config::get('frio', 'scheme', Config::get('frio', 'schema'));