From b98be2e5bcd1abfb98a544fdad66696007925b38 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 11 Oct 2014 03:29:49 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/lib/classes/db_mysql.inc.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index e0d3517..ee159fa 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -126,7 +126,8 @@
if($iPos2 !== false && ($iPos === false || $iPos2 <= $iPos)) {
$sTxt = $this->escape($sValue);
-
+
+ $sTxt = str_replace('`', '', $sTxt);
if(strpos($sTxt, '.') !== false) $sTxt = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $sTxt);
else $sTxt = '`' . $sTxt . '`';
@@ -419,7 +420,7 @@
if($this->show_error_messages && $conf['demo_mode'] === false) {
echo $sErrormsg . $sAddMsg;
} else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($sErrormsg . $sAddMsg, LOGLEVEL_WARN);
+ $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
}
}
--
Gitblit v1.9.1