From 0186be6aebc6479fb0164dd76a0f37919f4819fe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 12:36:27 +0400
Subject: [PATCH] another take on inclusion of errorhandler in CLI scripts

---
 update.php         | 4 ++++
 update_daemon2.php | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/update.php b/update.php
index 23e42a052..d8b956942 100755
--- 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 5a033d9bb..bf6761205 100755
--- 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')) {