From 4ba802d8f0a28ba138c21cd90d336e220f81a099 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 24 Oct 2008 16:43:02 +0000
Subject: added a conditional for $this->port in the mysqli driver.  Apparently
 it doesn't like being sent an empty string.

---
 system/database/drivers/mysqli/mysqli_driver.php | 10 +++++++++-
 user_guide/changelog.html                        |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 4bbe5ebf6..f72db64b6 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -60,7 +60,15 @@ class CI_DB_mysqli_driver extends CI_DB {
 	 */	
 	function db_connect()
 	{
-		return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database, $this->port);
+		if ($this->port != '')
+		{
+			return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database, $this->port);			
+		}
+		else
+		{
+			return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database);
+		}
+
 	}
 
 	// --------------------------------------------------------------------
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 03ff7280d..b7c84bc32 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -61,6 +61,10 @@ Change Log
 <p>Release Date: not yet released<br />
 SVN Revision: </p>
 
+<h3>Bug fixes for 1.7.1</h3>
+<ul>
+	<li>Fixed a bug in the MySQLi driver when no port is specified</li>
+</ul>
 
 
 <h2>Version 1.7</h2>
-- 
cgit v1.2.3-24-g4f1b