From 1b1a3d7a5ab7578384154caab231f0f4794e7e46 Mon Sep 17 00:00:00 2001
From: joelmoss <joelmoss@3807eeeb-6ff5-0310-8944-8be069107fe0>
Date: Mon, 2 Jun 2008 19:00:11 +0000
Subject: [PATCH] Reverting last change to DboMysqli, and we now use port
 config var as the socket if it is a string.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7093 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/model/datasources/dbo/dbo_mysqli.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index bfa98303c..3280bcb2c 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -73,8 +73,7 @@ class DboMysqli extends DboSource {
 		'password' => '',
 		'database' => 'cake',
 		'port' => '3306',
-		'connect' => 'mysqli_connect',
-		'socket' => '/tmp/mysql.sock'
+		'connect' => 'mysqli_connect'
 	);
 /**
  * Mysqli column definition
@@ -102,6 +101,14 @@ class DboMysqli extends DboSource {
 	function connect() {
 		$config = $this->config;
 		$this->connected = false;
+		
+		if (is_numeric($config['port'])) {
+			$config['socket'] = null;
+		} else {
+			$config['socket'] = $config['port'];
+			$config['port'] = null;
+		}
+		
 		$this->connection = mysqli_connect($config['host'], $config['login'], $config['password'], $config['database'], $config['port'], $config['socket']);
 
 		if ($this->connection !== false) {