another take on inclusion of errorhandler in CLI scripts

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index f5fa9e5694f0e170c6fa4bcd7e24592eb1c73fcb..d8b956942dd92459c28ff89681b02212ae396b44 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -13,7 +13,6 @@
        require_once "sanity_check.php";
        require_once "db.php";
        require_once "db-prefs.php";
-       require_once "errorhandler.php";
 
        if (!defined('PHP_EXECUTABLE'))
                define('PHP_EXECUTABLE', '/usr/bin/php');
@@ -89,6 +88,18 @@
                return;
        }
 
+       if (!isset($options['daemon'])) {
+               require_once "errorhandler.php";
+       }
+
+       if (!isset($options['update-schema'])) {
+               $schema_version = get_schema_version($link);
+
+               if ($schema_version != SCHEMA_VERSION) {
+                       die("Schema version is wrong, please upgrade the database.\n");
+               }
+       }
+
        define('QUIET', isset($options['quiet']));
 
        if (isset($options["log"])) {