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

Merge pull request #4483 from annando/not-always-db-update 

Only do a database update when the current system version is lower
This commit is contained in:
Hypolite Petovan 2018-02-20 23:16:55 -05:00 committed by GitHub
parent cf74da9c86 ecc0395151
commit 1fb82720be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -664,7 +664,7 @@ function check_db($via_worker)
if (empty($build)) { if (empty($build)) {
Config::set('system', 'build', DB_UPDATE_VERSION - 1); Config::set('system', 'build', DB_UPDATE_VERSION - 1);
$build = DB_UPDATE_VERSION; $build = DB_UPDATE_VERSION - 1;
} }
// We don't support upgrading from very old versions anymore // We don't support upgrading from very old versions anymore
@ -672,7 +672,7 @@ function check_db($via_worker)
die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.'); die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
} }
if ($build != DB_UPDATE_VERSION) { if ($build < DB_UPDATE_VERSION) {
// When we cannot execute the database update via the worker, we will do it directly // When we cannot execute the database update via the worker, we will do it directly
if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) { if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
update_db(); update_db();