[various] Set config loaded from default values to SOURCE_STATIC

- This prevents from clobbering values loaded from base `config/` folder

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 2ae845e5c75e867f88bdad6222a0ab5ecf220c7e..2eb78fbd2558cfd6bffb9a6a33d127b223e7c2b4 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -35,7 +35,7 @@ function geonames_install()
 
 function geonames_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(App $a, array &$item)

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 27e5500254c673c9f67c1e3440d9fdcc7163234b..d53e8ef83ddaf2002d76e5b827a8737b49bf1e9a 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -28,7 +28,7 @@ function gravatar_install() {
 
 function gravatar_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 69beba599b01af62dac9adf20de4a898b9a3d2d4..6842f6fc54335ea85a8036c40f57a6eab3ca12bc 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -56,7 +56,7 @@ function impressum_footer(App $a, string &$body)
 
 function impressum_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(App $a, string &$body)

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 2935c74aaf8e54b765690b16535b170e269aaec4..04ac00db7a7390b19a8df2f71e2d98893eb3a404 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -45,7 +45,7 @@ function ldapauth_install()
 
 function ldapauth_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(App $a, array &$b)

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 1ddeccd42a17435828b80d0e591858dbdfd06729..f2a49ac83e1da4d5e5d28f699e26845427918ed0 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -26,7 +26,7 @@ function libravatar_install()
 
 function libravatar_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index fe6ff9ae630e3752f36e9b021541e4788498310c..e83e02c27f5c315d3c36f2f9b4b4931194464b1b 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -37,7 +37,7 @@ function openstreetmap_install()
 
 function openstreetmap_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(App $a, &$navHtml)

diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 72113e0ac35c62d6cd0939027e137610a35a9ccd..30f10ff815f572f414a331cc848269a8fe68bf01 100644 (file)
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -25,7 +25,7 @@ function phpmailer_install()
 
 function phpmailer_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('phpmailer'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 047e41a3975e91477fc2ab9f7d17135621cd8245..370121d7449a61262a84f47d0ea82a5825f34efe 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -50,7 +50,7 @@ function piwik_install() {
 
 function piwik_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function piwik_analytics(App $a, string &$b)

diff --git a/public_server/public_server.php b/public_server/public_server.php
index cc85ba60b54f2aeff9eeaa0d3cd4ebc188876ca4..95e1e8dd3ff20c17189dda9e59abd1399a9127b4 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -29,7 +29,7 @@ function public_server_install()
 
 function public_server_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account(App $a, $b)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 4928b5e4b7b17465663a61197d678750a8a8e55e..f5c2b14ecd4e7bece9d2418e08f6bf79918e4cc8 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -320,7 +320,7 @@ function pumpio_settings_post(App $a, array &$b)
 
 function pumpio_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pumpio_hook_fork(App $a, array &$b)

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 94e63dda285cd103b82ef37ce17a6a963bb1f19a..903f80b11d6ebf287fc91c17208583cd65d38228 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -27,7 +27,7 @@ function testdrive_install()
 
 function testdrive_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function testdrive_globaldir_update(App $a, array &$b)

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 99985d97a142e922a7300b08bec0558a15c49da4..39e5b44795b326041b882f209c4ce16660026699 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -125,7 +125,7 @@ function twitter_install()
 
 function twitter_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)