Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

Conflicts:
	update_daemon2.php

update.php

@@ -14,7 +14,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');
@@ -88,6 +87,10 @@
 		return;
 	}
 
+	if (!isset($options['daemon'])) {
+		require_once "errorhandler.php";
+	}
+
 	if (!isset($options['update-schema'])) {
 		$schema_version = get_schema_version();