From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 01 Jul 2016 03:53:30 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/db_mysql.inc.php | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 7c46820..64ba44e 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -87,12 +87,12 @@
if(!is_object($this->_iConnId) || mysqli_connect_error()) {
$this->_iConnId = null;
- $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!');
+ $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!', '', true);
return false;
}
if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
$this->close();
- $this->_sqlerror('Datenbank nicht gefunden / Database not found');
+ $this->_sqlerror('Datenbank nicht gefunden / Database not found', '', true);
return false;
}
@@ -210,7 +210,7 @@
}
if($try > 9) {
- $this->_sqlerror('DB::query -> reconnect');
+ $this->_sqlerror('DB::query -> reconnect', '', true);
return false;
} else {
sleep(($try > 7 ? 5 : 1));
@@ -464,7 +464,7 @@
*
* @access private
*/
- private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '') {
+ private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '', $bNoLog = false) {
global $app, $conf;
$mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
@@ -475,9 +475,11 @@
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 . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
- }
+ } elseif(is_object($app) && method_exists($app, 'log') && $bNoLog == false) {
+ $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
+ } elseif(php_sapi_name() == 'cli') {
+ echo $sErrormsg . $sAddMsg;
+ }
}
public function affectedRows() {
--
Gitblit v1.9.1