valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Conflicts:
	update_daemon2.php
This commit is contained in:
Andrew Dolgov 2013-04-17 18:23:20 +04:00
parent d632b28cef 0186be6aeb
commit 57bac1bea9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
update.php
View File

@ -14,7 +14,6 @@
require_once "sanity_check.php"; require_once "sanity_check.php";
require_once "db.php"; require_once "db.php";
require_once "db-prefs.php"; require_once "db-prefs.php";
require_once "errorhandler.php";
if (!defined('PHP_EXECUTABLE')) if (!defined('PHP_EXECUTABLE'))
define('PHP_EXECUTABLE', '/usr/bin/php'); define('PHP_EXECUTABLE', '/usr/bin/php');
@ -88,6 +87,10 @@
return; return;
} }
if (!isset($options['daemon'])) {
require_once "errorhandler.php";
}
if (!isset($options['update-schema'])) { if (!isset($options['update-schema'])) {
$schema_version = get_schema_version(); $schema_version = get_schema_version();