Merge pull request #2558 from jreklund/mysqli-connection-debug

MGatner · web-flow · commit 6d911eb105be · 2020-02-15T07:30:53.000-05:00
MySQLi: Incorrect DBDebug flag used for connection charset
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -203,7 +203,7 @@ public function connect(bool $persistent = false)
 						"Database: Unable to set the configured connection charset ('{$this->charset}').");
 					$this->mysqli->close();
 
-					if ($this->db->debug)
+					if ($this->DBDebug)
 					{
 						throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);
 					}

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public function connect(bool $persistent = false)`
`203`	`203`	`"Database: Unable to set the configured connection charset ('{$this->charset}').");`
`204`	`204`	`$this->mysqli->close();`
`205`	`205`
`206`		`- if ($this->db->debug)`
	`206`	`+ if ($this->DBDebug)`
`207`	`207`	`{`
`208`	`208`	`throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);`
`209`	`209`	`}`