From f25b4b0309989d844d5b306effc8bb7e28ea7461 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 28 Feb 2013 05:32:10 -0500
Subject: [PATCH] Disable mysql error messages in demo mode. Fixed a sql error in vm list.
---
interface/lib/classes/db_mysql.inc.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 528099f..b84105f 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -84,7 +84,7 @@
// error handler
public function updateError($location) {
- global $app;
+ global $app, $conf;
/*
if(!is_null($this->connect_error)) {
@@ -108,7 +108,7 @@
if($this->errorNumber) {
$error_msg = $this->errorLocation .' '. $this->errorMessage;
// This right here will allow us to use the samefile for server & interface
- if($this->show_error_messages && $conf['demo_mode'] != true) {
+ if($this->show_error_messages && $conf['demo_mode'] === false) {
echo $error_msg;
} else if(is_object($app) && method_exists($app, 'log')) {
$app->log($error_msg, LOGLEVEL_WARN);
@@ -123,7 +123,8 @@
}
public function query($queryString) {
- if($this->isConnected == false) return false;
+ global $conf;
+ if($this->isConnected == false) return false;
$try = 0;
do {
$try++;
@@ -144,7 +145,7 @@
} while($ok == false);
$this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
- if($this->errorNumber) debug_print_backtrace();
+ if($this->errorNumber && $conf['demo_mode'] === false) debug_print_backtrace();
if(!$this->queryId) {
return false;
}
--
Gitblit v1.9.1