clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12718 from annando/config 

More configs moved to key values
This commit is contained in:
Hypolite Petovan 2023-01-22 16:31:17 -05:00 committed by GitHub
parent d7f8b77e1d 9e9aa4b108
commit 6fe85d9e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 2023.03-dev (Giant Rhubarb)
-- DB_UPDATE_VERSION 1512
-- DB_UPDATE_VERSION 1513
-- ------------------------------------------

3
src/Module/Admin/Summary.php
View File

@ -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);
}

2
src/Worker/CheckVersion.php
View File

@ -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');

2
static/dbstructure.config.php
View File

@ -55,7 +55,7 @@
use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1512);
define('DB_UPDATE_VERSION', 1513);
}
return [

9
update.php
View File

@ -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');
}