summaryrefslogtreecommitdiff
path: root/system/libraries/Database_Mysqli.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-01-06 11:35:01 -0800
committerTim Almdal <tnalmdal@shaw.ca>2010-01-06 11:35:01 -0800
commita74fd27e5f238f91f39be14056692945eecedabc (patch)
tree6a4a3311536500b06178d5a8c620263b0130d3ea /system/libraries/Database_Mysqli.php
parent7778d4c05075e67f096d3d5365e5ae35e1b0a737 (diff)
Updated Kohana to r4737
Diffstat (limited to 'system/libraries/Database_Mysqli.php')
-rw-r--r--system/libraries/Database_Mysqli.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/system/libraries/Database_Mysqli.php b/system/libraries/Database_Mysqli.php
index 08ed99df..41b635d1 100644
--- a/system/libraries/Database_Mysqli.php
+++ b/system/libraries/Database_Mysqli.php
@@ -1,9 +1,7 @@
<?php defined('SYSPATH') or die('No direct script access.');
/**
* MySQL database connection.
- *
- * $Id: Database_Mysqli.php 4712 2009-12-10 21:47:09Z cbandy $
- *
+ *
* @package Kohana
* @author Kohana Team
* @copyright (c) 2008-2009 Kohana Team
@@ -30,13 +28,13 @@ class Database_Mysqli_Core extends Database_Mysql {
$host = isset($host) ? $host : $socket;
$mysqli = mysqli_init();
-
+
if ( ! $mysqli->real_connect($host, $user, $pass, $database, $port, $socket, $params))
throw new Database_Exception('#:errno: :error',
array(':error' => $mysqli->connect_error, ':errno' => $mysqli->connect_errno));
-
+
$this->connection = $mysqli;
-
+
if (isset($this->config['character_set']))
{
// Set the character set