Move Config::load() to DI::config()->load()
This commit is contained in:
		
					parent
					
						
							
								1bc4b2e078
							
						
					
				
			
			
				commit
				
					
						5d294e8be8
					
				
			
		
					 4 changed files with 3 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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.
 | 
			
		||||
	 *
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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]);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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'));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue