From 2e33d99f187ce10cab56c68841d3a768c41b4699 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 10 Feb 2019 20:10:59 +0100 Subject: [PATCH] Moved method names & class --- geonames/geonames.php | 4 ++-- gravatar/gravatar.php | 4 ++-- impressum/impressum.php | 4 ++-- ldapauth/ldapauth.php | 4 ++-- libravatar/libravatar.php | 4 ++-- openstreetmap/openstreetmap.php | 4 ++-- piwik/piwik.php | 4 ++-- public_server/public_server.php | 4 ++-- pumpio/pumpio.php | 4 ++-- testdrive/testdrive.php | 4 ++-- twitter/twitter.php | 5 ++--- 11 files changed, 22 insertions(+), 23 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index cf971984..a28ff585 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -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) { diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 363515d3..d14cf9ba 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -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')); } /** diff --git a/impressum/impressum.php b/impressum/impressum.php index c4f45a0d..99f8c8c7 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -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) { diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index dfd9f59d..6fef9767 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -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) diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 2ba32cc7..7da9eb45 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -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')); } /** diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index ab6ec27f..6507d278 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -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) diff --git a/piwik/piwik.php b/piwik/piwik.php index 9e43cd5f..ad89d0f3 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -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) { diff --git a/public_server/public_server.php b/public_server/public_server.php index 2dcefe85..639b8fce 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -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) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index d8a2c546..3ebd057f 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -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) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index dea5026b..3b4691b0 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -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) { diff --git a/twitter/twitter.php b/twitter/twitter.php index f5c7de0d..66fe1bf6 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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)