Merge pull request #4515 from MrPetovan/task/4513-hide-attendno-events

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 0d26403bcb9a1f94317741e7b1313163b916fb1b..472814a6db546d9a07e41732bc43533982249a69 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Asparagus');
 define('FRIENDICA_VERSION',      '3.6-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1254);
+define('DB_UPDATE_VERSION',      1255);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -664,7 +664,7 @@ function check_db($via_worker)
 
        if (empty($build)) {
                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
@@ -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.');
        }
 
-       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
                if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
                        update_db();
@@ -856,7 +856,7 @@ function check_addons(App $a)
 
 function get_guid($size = 16, $prefix = '')
 {
-       if (is_bool($prefix)) {
+       if (is_bool($prefix) && !$prefix) {
                $prefix = '';
        } elseif ($prefix == '') {
                $a = get_app();