From 5eafbcd5cfa99b624af7534fce798cbac29c3fbb Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 16 Apr 2015 08:53:27 +0200
Subject: [PATCH] - don't set connect params in constructor (too early)
---
install/lib/mysql.lib.php | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index e151bc417d..c0f7317963 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -60,10 +60,14 @@ class db extends mysqli
////
*/
- // constructor
- public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) {
+ public function __destruct() {
+ if($this->_iConnId) mysqli_close($this->_iConnId);
+ }
+
+ private function do_connect() {
global $conf;
-
+
+ if($this->_iConnId) return true;
$this->dbHost = $conf["mysql"]["host"];
$this->dbName = '';
$this->dbUser = $conf["mysql"]["admin_user"];
@@ -71,14 +75,6 @@ class db extends mysqli
$this->dbCharset = $conf["mysql"]["charset"];
$this->dbNewLink = false;
$this->dbClientFlags = null;
- }
-
- public function __destruct() {
- if($this->_iConnId) mysqli_close($this->_iConnId);
- }
-
- private function do_connect() {
- if($this->_iConnId) return true;
$this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass);
$try = 0;
--
GitLab