Fix erroneous variables from 85bc9fc

narfbg · narfbg · commit f437fd20a78b · 2015-12-14T18:06:49.000+02:00
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
@@ -153,7 +153,7 @@ public function db_connect($persistent = FALSE)
 			{
 				log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");
 				$this->close();
-				return ($this->db->debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;
+				return ($this->db->debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;
 			}
 
 			if ($this->stricton)
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
@@ -177,7 +177,7 @@ public function db_connect($persistent = FALSE)
 			{
 				log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");
 				$mysqli->close();
-				return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;
+				return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;
 			}
 
 			return $mysqli;
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
@@ -163,11 +163,11 @@ public function db_connect($persistent = FALSE)
 				return FALSE;
 			}
 
-			if (pg_set_client_encoding($this->conn_id, $charset) !== 0)
+			if (pg_set_client_encoding($this->conn_id, $this->char_set) !== 0)
 			{
 				log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");
 				pg_close($this->conn_id);
-				return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;
+				return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;
 			}
 
 			empty($this->schema) OR $this->simple_query('SET search_path TO '.$this->schema.',public');

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function db_connect($persistent = FALSE)`
`153`	`153`	`{`
`154`	`154`	`log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");`
`155`	`155`	`$this->close();`
`156`		`- return ($this->db->debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;`
	`156`	`+ return ($this->db->debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if ($this->stricton)`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public function db_connect($persistent = FALSE)`
`177`	`177`	`{`
`178`	`178`	`log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");`
`179`	`179`	`$mysqli->close();`
`180`		`- return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;`
	`180`	`+ return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`return $mysqli;`
Original file line number	Diff line number	Diff line change
`@@ -163,11 +163,11 @@ public function db_connect($persistent = FALSE)`
`163`	`163`	`return FALSE;`
`164`	`164`	`}`
`165`	`165`
`166`		`- if (pg_set_client_encoding($this->conn_id, $charset) !== 0)`
	`166`	`+ if (pg_set_client_encoding($this->conn_id, $this->char_set) !== 0)`
`167`	`167`	`{`
`168`	`168`	`log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");`
`169`	`169`	`pg_close($this->conn_id);`
`170`		`- return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;`
	`170`	`+ return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`empty($this->schema) OR $this->simple_query('SET search_path TO '.$this->schema.',public');`