Merge pull request #806 from nupplaphil/config_followup

Moved method names & class
pull/808/head
Hypolite Petovan 2019-02-17 21:00:31 -05:00 committed by GitHub
commit f42601ffac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 22 additions and 23 deletions

View File

@ -77,9 +77,9 @@ function geonames_uninstall() {
Logger::log("removed geonames");
}
function geonames_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
function geonames_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('geonames'));
$a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
}
function geonames_post_hook($a, &$item) {

View File

@ -36,9 +36,9 @@ function gravatar_uninstall() {
Logger::log("unregistered gravatar in avatar_lookup hook");
}
function gravatar_load_config(App $a, Config\ConfigCacheLoader $loader)
function gravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('gravatar'));
$a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
}
/**

View File

@ -52,9 +52,9 @@ function impressum_footer($a, &$b) {
}
}
function impressum_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
function impressum_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('impressum'));
$a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
}
function impressum_show($a,&$b) {

View File

@ -71,9 +71,9 @@ function ldapauth_uninstall()
Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
}
function ldapauth_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
function ldapauth_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('ldapauth'));
$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
}
function ldapauth_hook_authenticate($a, &$b)

View File

@ -36,9 +36,9 @@ function libravatar_uninstall()
Logger::log("unregistered libravatar in avatar_lookup hook");
}
function libravatar_load_config(App $a, Config\ConfigCacheLoader $loader)
function libravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('libravatar'));
$a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
}
/**

View File

@ -47,9 +47,9 @@ function openstreetmap_uninstall()
Logger::log("removed openstreetmap");
}
function openstreetmap_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
function openstreetmap_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('openstreetmap'));
$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
}
function openstreetmap_alterheader($a, &$navHtml)

View File

@ -52,9 +52,9 @@ function piwik_uninstall() {
Logger::log("uninstalled piwik addon");
}
function piwik_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
function piwik_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('piwik'));
$a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
}
function piwik_analytics($a,&$b) {

View File

@ -35,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, Config\ConfigCacheLoader $loader)
function public_server_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('public_server'));
$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
}
function public_server_register_account($a, $b)

View File

@ -377,9 +377,9 @@ function pumpio_settings_post(App $a, array &$b)
}
}
function pumpio_load_config(App $a, Config\ConfigCacheLoader $loader)
function pumpio_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('pumpio'));
$a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
}
function pumpio_hook_fork(App $a, array &$b)

View File

@ -35,9 +35,9 @@ function testdrive_uninstall() {
}
function testdrive_load_config(App $a, Config\ConfigCacheLoader $loader)
function testdrive_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('testdrive'));
$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
}
function testdrive_globaldir_update($a,&$b) {

View File

@ -75,7 +75,6 @@ use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@ -136,9 +135,9 @@ function twitter_uninstall()
Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post');
}
function twitter_load_config(App $a, Config\ConfigCacheLoader $loader)
function twitter_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
{
$a->getConfig()->loadConfigArray($loader->loadAddonConfig('twitter'));
$a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
}
function twitter_check_item_notification(App $a, array &$notification_data)