From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 14:23:20 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.9~25^2~168
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=57bac1bea99cdac24305c53272a48821e52a7c2e;p=tt-rss.git

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

Conflicts:
	update_daemon2.php
---

57bac1bea99cdac24305c53272a48821e52a7c2e
diff --cc update.php
index fcce26d5,d8b95694..894ccb32
--- a/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");