another take on inclusion of errorhandler in CLI scripts

diff --git a/update.php b/update.php
index 23e42a052421c70604ac8f75cbe008b0bef5fa18..d8b956942dd92459c28ff89681b02212ae396b44 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -88,6 +88,10 @@
                return;
        }
 
+       if (!isset($options['daemon'])) {
+               require_once "errorhandler.php";
+       }
+
        if (!isset($options['update-schema'])) {
                $schema_version = get_schema_version($link);
 

diff --git a/update_daemon2.php b/update_daemon2.php
index 5a033d9bb3fccf20300d55e621cd63b57e2aa307..bf6761205c96a00a273a9218459236a6e95643a6 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -256,6 +256,8 @@
 
                                        if (!init_connection($link)) return;
 
+                                       require_once "errorhandler.php";
+
                                        // We disable stamp file, since it is of no use in a multiprocess update.
                                        // not really, tho for the time being -fox
                                        if (!make_stampfile('update_daemon.stamp')) {