Merge pull request #12718 from annando/config
More configs moved to key values
This commit is contained in:
commit
6fe85d9e2c
|
@ -1,6 +1,6 @@
|
|||
-- ------------------------------------------
|
||||
-- Friendica 2023.03-dev (Giant Rhubarb)
|
||||
-- DB_UPDATE_VERSION 1512
|
||||
-- DB_UPDATE_VERSION 1513
|
||||
-- ------------------------------------------
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
use Friendica\Database\DBA;
|
||||
|
||||
if (!defined('DB_UPDATE_VERSION')) {
|
||||
define('DB_UPDATE_VERSION', 1512);
|
||||
define('DB_UPDATE_VERSION', 1513);
|
||||
}
|
||||
|
||||
return [
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue