Merge pull request #803 from nupplaphil/config_refact

Config Refactoring
This commit is contained in:
Hypolite Petovan 2019-02-06 10:52:02 -05:00 committed by GitHub
commit 37dd8a938b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 26 deletions

View file

@ -8,7 +8,6 @@
use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
@ -36,9 +35,9 @@ function public_server_uninstall()
Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
}
function public_server_load_config(App $a)
function public_server_load_config(App $a, Config\ConfigCacheLoader $loader)
{
$a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('public_server'));
}
function public_server_register_account($a, $b)