More configs moved to key values

diff --git a/src/Core/Config/Model/Config.php b/src/Core/Config/Model/Config.php
index 46d5643b344bc66e4538b693b17bc400bcba296f..0a242c858748264806c509b1d59ab000cd6665ed 100644 (file)
--- a/src/Core/Config/Model/Config.php
+++ b/src/Core/Config/Model/Config.php
@@ -27,6 +27,8 @@ use Friendica\Core\Config\Exception\ConfigFileException;
 use Friendica\Core\Config\Exception\ConfigPersistenceException;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
 
 /**
  * Configuration model, which manages the whole system configuration
@@ -118,6 +120,7 @@ class Config implements IManageConfigValues
        /** {@inheritDoc} */
        public function set(string $cat, string $key, $value): bool
        {
+               Logger::debug('Set config value', ['cat' => $cat, 'key' => $key, 'value' => $value, 'callstack' => System::callstack(20)]);
                if ($this->configCache->set($cat, $key, $value, Cache::SOURCE_DATA)) {
                        $this->save();
                        return true;

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index e963e7606d5980a3d16c8aefc79ba733a3d35dc5..f9c8cefbb613d5d6b59f092b422635f8ebb9cce4 100644 (file)
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -79,7 +79,8 @@ class Summary extends BaseAdmin
                // Check if github.com/friendica/stable/VERSION is higher then
                // the local version of Friendica. Check is opt-in, source may be stable or develop branch
                if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') {
-                       $gitversion = DI::config()->get('system', 'git_friendica_version');
+                       $gitversion = DI::keyValue()->get('git_friendica_version');
+
                        if (version_compare(App::VERSION, $gitversion) < 0) {
                                $warningtext[] = DI::l10n()->t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', App::VERSION, $gitversion);
                        }

diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
index 6676e51127245c2e478d9f0588efcf7cfad45e9d..f4c45fe33d5dd022dbcef71f2a103b673e2e9361 100644 (file)
--- a/src/Worker/CheckVersion.php
+++ b/src/Worker/CheckVersion.php
@@ -58,7 +58,7 @@ class CheckVersion
                $gitversion = DBA::escape(trim(DI::httpClient()->fetch($checked_url, HttpClientAccept::TEXT)));
                Logger::notice("Upstream VERSION is: ".$gitversion);
 
-               DI::config()->set('system', 'git_friendica_version', $gitversion);
+               DI::keyValue()->set('git_friendica_version', $gitversion);
 
                Logger::notice('checkversion: end');
 

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 4329410b4ac9234fb9d724a5fd246785aaded5db..9dfd7820c1d2ee16a55ac8dc8c19c0e714238386 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1512);
+       define('DB_UPDATE_VERSION', 1513);
 }
 
 return [

diff --git a/update.php b/update.php
index 8f937752599535f34bd58d941ca5e2c4a231a751..7d9a9d23637ad57f81ee5fa49056a1bb924e2a1b 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1244,3 +1244,12 @@ function update_1512()
        DI::config()->delete('nodeinfo', 'local_posts');
        DI::config()->delete('nodeinfo', 'local_comments');
 }
+
+function update_1513()
+{
+       DI::keyValue()->set('git_friendica_version', DI::config()->get('system', 'git_friendica_version'));
+       DI::keyValue()->set('twitter_application_name', DI::config()->get('twitter', 'application_name'));
+
+       DI::config()->delete('system', 'git_friendica_version');
+       DI::config()->delete('twitter', 'application_name');
+}