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

Conflicts:
	update_daemon2.php

diff --cc update.php
index fcce26d5c864ff950b8b1ad7e3091632b8d3d5c2,d8b956942dd92459c28ff89681b02212ae396b44..894ccb3272da31007003ae2e589f6ee3b3538f7c
--- 1/update.php
--- 2/update.php
+++ b/update.php
@@@ -88,8 -88,12 +87,12 @@@
                return;
        }
  
+       if (!isset($options['daemon'])) {
+               require_once "errorhandler.php";
+       }
+ 
        if (!isset($options['update-schema'])) {
 -              $schema_version = get_schema_version($link);
 +              $schema_version = get_schema_version();
  
                if ($schema_version != SCHEMA_VERSION) {
                        die("Schema version is wrong, please upgrade the database.\n");