From 330630c9d05911f472bf8cbcf26731f308f35454 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Fri, 23 Mar 2007 08:57:42 +0000
Subject: [PATCH] Adding fix for Ticket #2214 Removed persistent connection
setting in DboMysqli::connect() since there is no persistent connection
function for mysqli
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4656 3807eeeb-6ff5-0310-8944-8be069107fe0
---
cake/libs/model/datasources/dbo/dbo_mysqli.php | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index a1d09504a..f4c923299 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -65,7 +65,7 @@ class DboMysqli extends DboSource {
'password' => '',
'database' => 'cake',
'port' => '3306',
- 'connect' => 'mysqli_pconnect');
+ 'connect' => 'mysqli_connect');
/**
* Mysqli column definition
*
@@ -89,14 +89,7 @@ class DboMysqli extends DboSource {
*/
function connect() {
$config = $this->config;
- $connect = $config['connect'];
- $this->connected = false;
-
- if (!$config['persistent']) {
- $this->connection = mysqli_connect($config['host'], $config['login'], $config['password'], true);
- } else {
- $this->connection = $connect($config['host'], $config['login'], $config['password']);
- }
+ $this->connection = mysqli_connect($config['host'], $config['login'], $config['password'], null, $config['port']);
if (mysqli_select_db($this->connection, $config['database'])) {
$this->connected = true;