check plugins in separate function

diff --git a/boot.php b/boot.php
index 1a93086aea81cbb06af3bb907613a8f239957ec6..4567d76fce1c65ccc926be7ce943c509c4004aaa 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -806,16 +806,12 @@ function is_ajax() {
 
 // Primarily involved with database upgrade, but also sets the
 // base url for use in cmdline programs which don't have
-// $_SERVER variables, and synchronising the state of installed plugins.
+// $_SERVER variables
 
 
 if(! function_exists('check_config')) {
        function check_config(&$a) {
 
-               $build = get_config('system','build');
-               if(! x($build))
-                       $build = set_config('system','build',DB_UPDATE_VERSION);
-
                $url = get_config('system','url');
 
                // if the url isn't set or the stored url is radically different
@@ -830,6 +826,10 @@ if(! function_exists('check_config')) {
                        $url = set_config('system','url',$a->get_baseurl());
 
 
+               $build = get_config('system','build');
+               if(! x($build))
+                       $build = set_config('system','build',DB_UPDATE_VERSION);
+
                if($build != DB_UPDATE_VERSION) {
                        $stored = intval($build);
                        $current = intval(DB_UPDATE_VERSION);
@@ -898,6 +898,14 @@ if(! function_exists('check_config')) {
                        }
                }
 
+               return;
+       }
+}
+
+
+if(! function_exists('check_plugins')) {
+       function check_plugins(&$a) {
+
                /**
                 *
                 * Synchronise plugins:

diff --git a/index.php b/index.php
index 4c98cd6e02c0428eab7429d31c121822f03e0c83..c189c51df9c542eea3cb11f7364eb1b13d9f058c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -140,8 +140,11 @@ if($install)
        $a->module = 'install';
 elseif($maintenance)
        $a->module = 'maintenance';
-else
+else {
        proc_run('php', 'include/dbupdate.php');
+       check_plugins($a);
+       //check_config($a);
+}
 
 nav_set_selected('nothing');