remove db_connect, db_close; CLI fixes

2 files changed, 3 insertions, 9 deletions

diff --git a/include/db.php b/include/db.php
index 11e7312ad..72c78474a 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,9 +1,5 @@
 <?php
 
-function db_connect($host, $user, $pass, $db) {
-	return Db::get()->connect($host, $user, $pass, $db, 0);
-}
-
 function db_escape_string( $s, $strip_tags = true) {
 	return Db::get()->escape_string($s, $strip_tags);
 }
@@ -25,10 +21,6 @@ function db_fetch_result($result, $row, $param) {
 	return Db::get()->fetch_result($result, $row, $param);
 }
 
-function db_close() {
-	return Db::get()->close();
-}
-
 function db_affected_rows( $result) {
 	return Db::get()->affected_rows($result);
 }
diff --git a/include/errorhandler.php b/include/errorhandler.php
index b1a0d3d0c..2c8d35f83 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -6,7 +6,7 @@ require_once "classes/logger/sql.php";
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	global $logger;
 
-	if (error_reporting() == 0) return false;
+	if (error_reporting() == 0 || !$errno) return false;
 
 	if (!$logger) $logger = new Logger_SQL();
 
@@ -30,6 +30,8 @@ function ttrss_fatal_handler() {
 		$line = $error["line"];
 		$errstr  = $error["message"];
 
+		if (!$errno) return false;
+
 		$context = debug_backtrace();
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);