Moved method names & class

diff --git a/geonames/geonames.php b/geonames/geonames.php
index cf9719841c1acfd2e0220b8e2f76d31e2f47e0ff..a28ff585ba5b2d04eaf3fa63c36cc7c403e9de04 100644 (file)
--- 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 363515d368df607dd91c44e68c66e92e66f64d91..d14cf9ba185166743c7fa70f3c9399a8c2e77d37 100644 (file)
--- 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 c4f45a0d642bfea021cb8d1a56d3bd8d3f8fbc65..99f8c8c7ccd0d354f205e4e596141c321b0a6583 100644 (file)
--- 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 dfd9f59dede8f04cbae3d5da95f6a9aab3a3d29b..6fef97679e2771a370bf741edae16f94ecc9aa47 100644 (file)
--- 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 2ba32cc7b630da4fcceea8b58045d5a6da2f2736..7da9eb45aa4c96edac10785dd1e6062676385468 100644 (file)
--- 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 ab6ec27fc9987ceb2ddcbcca01204d123125e90d..6507d2783e07ec764e04d77b283acee38166a698 100644 (file)
--- 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 9e43cd5f184d31b1144cc67a824a3a3d8ba6b338..ad89d0f3e3e18645bd7af1bb20e70cb267e1edf5 100644 (file)
--- 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 2dcefe8531fd7bf6c591d7577e3e92ecb3c1c0d7..639b8fcef21a6a25306237803a3bf87ab991e6ed 100644 (file)
--- 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 d8a2c546f1fe0d69501cffd999c2495a087774b5..3ebd057f12de5dad6f0463b057b9de390ace57e4 100644 (file)
--- 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 dea5026ba5ad3d66100cfe41dd9b422bb7f2540b..3b4691b01ddc8c1691b0ca3dbbd9104cb237acf2 100644 (file)
--- 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 f5c7de0dfc456564751dfb41b689ca585c86063e..66fe1bf6a81df4f9d18ced8915dee9fa47de599a 100644 (file)
--- 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)