public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-30 09:37:10 +00:00
Code Issues Releases Wiki Activity

remove db_connect, db_close; CLI fixes

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-17 17:00:24 +04:00
parent 6322ac79a0
commit eefaa2df38
10 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/db.php
View File

@@ -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);
}

4
include/errorhandler.php
View File

@@ -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);