From e6a2917b9de293e735df5dbf0b10dce967185f45 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 17 Apr 2013 10:35:00 -0400 Subject: [PATCH] Fix in ispconfig url detection function when nginx returns '_' as $_SERVER['SERVER_NAME'] --- interface/lib/classes/db_mysql.inc.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index b84105f..4672998 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -44,7 +44,7 @@ private $errorNumber = 0; // last error number public $errorMessage = ''; // last error message private $errorLocation = '';// last error location - public $show_error_messages = true; // false in server, true in interface + public $show_error_messages = false; // false in server, true in interface private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor // constructor @@ -107,7 +107,7 @@ $this->errorLocation = $location; if($this->errorNumber) { $error_msg = $this->errorLocation .' '. $this->errorMessage; - // This right here will allow us to use the samefile for server & interface + // This right here will allow us to use the same file for server & interface if($this->show_error_messages && $conf['demo_mode'] === false) { echo $error_msg; } else if(is_object($app) && method_exists($app, 'log')) { @@ -190,11 +190,11 @@ // returns number of rows returned by the last select query public function numRows() { - return $this->queryId->num_rows; + return intval($this->queryId->num_rows); } public function affectedRows() { - return $this->queryId->affected_rows; + return intval($this->queryId->affected_rows); } // returns mySQL insert id -- Gitblit v1.9.1