diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-17 18:23:20 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-17 18:23:20 +0400 |
| commit | 57bac1bea99cdac24305c53272a48821e52a7c2e (patch) | |
| tree | 5c4a78836bb22744c8b2c44271d49e52e48223f4 /update.php | |
| parent | d632b28cef93a159739e674a3573f197cc705c74 (diff) | |
| parent | 0186be6aebc6479fb0164dd76a0f37919f4819fe (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Conflicts:
update_daemon2.php
Diffstat (limited to 'update.php')
| -rwxr-xr-x | update.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/update.php b/update.php index fcce26d5c..894ccb327 100755 --- a/update.php +++ b/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(); |