Refactoring ConfigCacheLoader methods

diff --git a/geonames/geonames.php b/geonames/geonames.php
index b1d8278bf84b828b28baa9ef4c61bab6bf8e7190..cf9719841c1acfd2e0220b8e2f76d31e2f47e0ff 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -79,7 +79,7 @@ function geonames_uninstall() {
 
 function geonames_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('geonames', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('geonames'));
 }
 
 function geonames_post_hook($a, &$item) {

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index f004eb80a5052fed15f8d7e1a53d239810633c53..363515d368df607dd91c44e68c66e92e66f64d91 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -38,7 +38,7 @@ function gravatar_uninstall() {
 
 function gravatar_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('gravatar', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('gravatar'));
 }
 
 /**

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 49bf8264fe21ffe0dc988f1d273cbfa15b0c0678..07a0e073de23ddfcef8ec2f1ecabcace923a493a 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -54,7 +54,7 @@ function impressum_footer($a, &$b) {
 
 function impressum_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('impressum', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('impressum'));
 }
 
 function impressum_show($a,&$b) {

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index cf6b4b4a830ffebbd2c28be95ee74217132ff791..dfd9f59dede8f04cbae3d5da95f6a9aab3a3d29b 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -73,7 +73,7 @@ function ldapauth_uninstall()
 
 function ldapauth_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('ldapauth', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('ldapauth'));
 }
 
 function ldapauth_hook_authenticate($a, &$b)

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 0edcc7672644aa80cd19f62db8381bb381649342..2ba32cc7b630da4fcceea8b58045d5a6da2f2736 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -38,7 +38,7 @@ function libravatar_uninstall()
 
 function libravatar_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('libravatar', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('libravatar'));
 }
 
 /**

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 14cd411d154b80289aeda2dc9020d71ece8e0229..ab6ec27fc9987ceb2ddcbcca01204d123125e90d 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -49,7 +49,7 @@ function openstreetmap_uninstall()
 
 function openstreetmap_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('openstreetmap', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('openstreetmap'));
 }
 
 function openstreetmap_alterheader($a, &$navHtml)

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 6341a702188ed961e76f3e94201dc4f76d6a8831..9e43cd5f184d31b1144cc67a824a3a3d8ba6b338 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -54,7 +54,7 @@ function piwik_uninstall() {
 
 function piwik_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('piwik', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('piwik'));
 }
 
 function piwik_analytics($a,&$b) {

diff --git a/public_server/public_server.php b/public_server/public_server.php
index bb294e3a0aff2a7fd9bd5f8231f148318a971053..ec46e27141d23152625fd3863e39b583e0a362f2 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -37,7 +37,7 @@ function public_server_uninstall()
 
 function public_server_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('public_server', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('public_server'));
 }
 
 function public_server_register_account($a, $b)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 428d626d29419bf5ce4658f334414bece91c70e4..e289256821084ff016bffced681553d58d154387 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -380,7 +380,7 @@ function pumpio_settings_post(App $a, array &$b)
 
 function pumpio_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('pumpio', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('pumpio'));
 }
 
 function pumpio_hook_fork(App $a, array &$b)

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index bf6709834be2a09627bd812a72d001ea2107c4df..9fc04201cff7bd0690674c60bde802ea7d2f9759 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -37,7 +37,7 @@ function testdrive_uninstall() {
 
 function testdrive_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('testdrive', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('testdrive'));
 }
 
 function testdrive_globaldir_update($a,&$b) {

diff --git a/twitter/twitter.php b/twitter/twitter.php
index fa9354ed3e1c493da19361f69045527c7092401a..811d62ef9bd5c7a2ba9fc9380cf9403040b94a89 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -142,7 +142,7 @@ function twitter_uninstall()
 
 function twitter_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->getConfig()->loadConfigArray($loader->loadConfigFile('twitter', true));
+       $a->getConfig()->loadConfigArray($loader->loadAddonConfig('twitter'));
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)