Merge branch 'develop' into task/6778-add-storage-move-to-cron

This commit is contained in:
Hypolite Petovan 2019-03-27 14:13:42 -04:00 committed by GitHub
commit 09e03c9213
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 1269 additions and 245 deletions

View file

@ -7,6 +7,7 @@ use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\Installer;
use Friendica\Core\Theme;
use Friendica\Util\Config\ConfigFileLoader;
use RuntimeException;
class AutomaticInstallation extends Console
@ -103,8 +104,8 @@ HELP;
}
//reload the config cache
$loader = new Config\Cache\ConfigCacheLoader($a->getBasePath(), $a->getMode());
$loader->loadConfigFiles($configCache);
$loader = new ConfigFileLoader($a->getBasePath(), $a->getMode());
$loader->setupCache($configCache);
} else {
// Creating config file