X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fdb.php;h=11e7312ad1ee04ff646ec5f521e5fb0ceed9aa44;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=28718fb02a886d8831f580adfa00f4aee319bac1;hpb=65d0cc64a2ca1ce259fbba501b13deaf1870e540;p=tt-rss.git

diff --git a/include/db.php b/include/db.php
index 28718fb0..11e7312a 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,69 +1,44 @@
 <?php
 
-require_once "config.php";
-
-$db_class = 'Db_'.ucfirst(DB_TYPE);
-$db_class_file = 'classes/' . str_replace('_', '/', $db_class) . '.php';
-
-require_once "classes/Db/Interface.php";
-require_once "classes/Db/Abstract.php";
-require_once $db_class_file;
-
-$db = $db_class::instance(); //  call_user_func(array($db_class, 'instance'));
-
-function db_connect($host, $user, $pass, $db_name) {
-    global $db;
-    return $db->connect($host, $user, $pass, $db_name);
+function db_connect($host, $user, $pass, $db) {
+	return Db::get()->connect($host, $user, $pass, $db, 0);
 }
 
-function db_escape_string($s, $strip_tags = true) {
-    global $db;
-    return $db->escape_string($s, $strip_tags);
+function db_escape_string( $s, $strip_tags = true) {
+	return Db::get()->escape_string($s, $strip_tags);
 }
 
-function db_query($link, $query, $die_on_error = true) {
-    global $db;
-    return $db->query($query, $die_on_error);
+function db_query( $query, $die_on_error = true) {
+	return Db::get()->query($query, $die_on_error);
 }
 
 function db_fetch_assoc($result) {
-    global $db;
-    return $db->fetch_assoc($result);
+	return Db::get()->fetch_assoc($result);
 }
 
+
 function db_num_rows($result) {
-    global $db;
-    return $db->num_rows($result);
+	return Db::get()->num_rows($result);
 }
 
 function db_fetch_result($result, $row, $param) {
-    global $db;
-    return $db->fetch_result($result, $row, $param);
-}
-
-function db_unescape_string($str) {
-    global $db;
-    return $db->unescape_string($str);
+	return Db::get()->fetch_result($result, $row, $param);
 }
 
-function db_close($link) {
-    global $db;
-    return $db->close();
+function db_close() {
+	return Db::get()->close();
 }
 
-function db_affected_rows($link, $result) {
-    global $db;
-    return $db->affected_rows($result);
+function db_affected_rows( $result) {
+	return Db::get()->affected_rows($result);
 }
 
-function db_last_error($link) {
-    global $db;
-    return $db->last_error();
+function db_last_error() {
+	return Db::get()->last_error();
 }
 
 function db_quote($str){
-    global $db;
-    return $db->quote($str);
+	return Db::get()->quote($str);
 }
 
-?>
\ No newline at end of file
+?>