The direct structure call is now only executed when called via the poller.php

diff --git a/boot.php b/boot.php
index 8e80bd4124e9683c96cf4063e3e2967b86a5332c..db5903829da4fff3ad4abfa3444eecb47889a86f 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -591,7 +591,7 @@ function is_ajax() {
        return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 }
 
-function check_db() {
+function check_db($via_worker) {
 
        $build = get_config('system', 'build');
        if (!x($build)) {
@@ -600,7 +600,7 @@ function check_db() {
        }
        if ($build != DB_UPDATE_VERSION) {
                // When we cannot execute the database update via the worker, we will do it directly
-               if (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php')) {
+               if (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php') && $via_worker) {
                        update_db(get_app());
                }
        }

diff --git a/include/poller.php b/include/poller.php
index 312347d71a6f9ea73377276b2963221eabf0ce21..d07107e072d61f87128bb2fec2fe8ff15c8cba45 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -889,7 +889,10 @@ function poller_run_cron() {
        poller_kill_stale_workers();
 }
 
-if (array_search(__file__,get_included_files())===0){
+if (array_search(__file__,get_included_files())===0) {
+       // Check the database structure and possibly fixes it
+       check_db(true);
+
        poller_run($_SERVER["argv"],$_SERVER["argc"]);
 
        poller_unclaim_process();

diff --git a/index.php b/index.php
index d3d2e42ae6a7c8e088be411c896e644764d8c816..49a3b216da6624fe4623c80cc43adf2bcd813835 100644 (file)
--- a/index.php
+++ b/index.php
@@ -196,7 +196,7 @@ if ($install && $a->module!="view") {
        $a->module = 'maintenance';
 } else {
        check_url($a);
-       check_db();
+       check_db(false);
        check_plugins($a);
 }
 

diff --git a/util/db_update.php b/util/db_update.php
index 1e717e98759335166c1c2157db3c95ac4adad609..5b31080506ed7093bdab14b4e754e1ee8032b6d4 100644 (file)
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -29,7 +29,6 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
 
 if ($build != DB_UPDATE_VERSION) {
        echo "Updating database...";
-       check_db($a);
+       update_db($a);
        echo "Done\n";
 }
-