From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/mysql.lib.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index c6078ca..7cf06ee 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -104,6 +104,7 @@
public function setDBName($name) {
$this->dbName = $name;
+ $this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass);
if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
$this->close();
$this->_sqlerror('Datenbank nicht gefunden / Database not found');
@@ -775,7 +776,7 @@
*
* @access private
*/
- public function db_result($iResId, $iConnection) {
+ public function __construct($iResId, $iConnection) {
$this->_iResId = $iResId;
$this->_iConnection = $iConnection;
}
@@ -901,7 +902,7 @@
*
* @access private
*/
- public function fakedb_result($aData) {
+ public function __construct($aData) {
$this->aResultData = $aData;
$this->aLimitedData = $aData;
reset($this->aLimitedData);
--
Gitblit v1.9.1