From 97d43372f1bb240eb82e9e623503f8cf2e82ad96 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 24 May 2013 09:50:53 -0400
Subject: [PATCH] Remove db connection and database params db_query() Add log
error param flag
---
include/mysql.php | 10 +++-------
include/mysqli.php | 8 +++-----
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/include/mysql.php b/include/mysql.php
index 27e3cc376..c7fcd5aff 100644
--- a/include/mysql.php
+++ b/include/mysql.php
@@ -79,16 +79,12 @@
}
// execute sql query
- function db_query($query, $database="", $conn="") {
+ function db_query($query, $logError=true) {
global $ost;
- if($conn) { /* connection is provided*/
- $res = ($database)?mysql_db_query($database, $query, $conn):mysql_query($query, $conn);
- } else {
- $res = ($database)?mysql_db_query($database, $query):mysql_query($query);
- }
+ $res = mysql_query($query);
- if(!$res && $ost) { //error reporting
+ if(!$res && $logError && $ost) { //error reporting
$msg='['.$query.']'."\n\n".db_error();
$ost->logDBError('DB Error #'.db_errno(), $msg);
//echo $msg; #uncomment during debuging or dev.
diff --git a/include/mysqli.php b/include/mysqli.php
index 430d0f75e..3a0bab182 100644
--- a/include/mysqli.php
+++ b/include/mysqli.php
@@ -98,14 +98,12 @@ function db_create_database($database, $charset='utf8',
}
// execute sql query
-function db_query($query, $conn=null) {
+function db_query($query, $logError=true) {
global $ost, $__db;
- if (!$conn) $conn = $__db;
+ $res = $__db->query($query);
- $res = $conn->query($query);
-
- if(!$res && $ost) { //error reporting
+ if(!$res && $logError && $ost) { //error reporting
$msg='['.$query.']'."\n\n".db_error();
$ost->logDBError('DB Error #'.db_errno(), $msg);
//echo $msg; #uncomment during debuging or dev.
--
GitLab