Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '3.0/develop' into 3.1/develop

  • Loading branch information...
commit 6a0a9bb797992a2cf5e5a2266e3c1a6593f78269 2 parents b9deff5 + f7433b1
@cbandy cbandy authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 classes/kohana/database/mysql.php
View
6 classes/kohana/database/mysql.php
@@ -59,14 +59,14 @@ public function connect()
$this->_connection = mysql_connect($hostname, $username, $password, TRUE);
}
}
- catch (ErrorException $e)
+ catch (Exception $e)
{
// No connection exists
$this->_connection = NULL;
throw new Database_Exception(':error',
- array(':error' => mysql_error()),
- mysql_errno());
+ array(':error' => $e->getMessage()),
+ $e->getCode());
}
// \xFF is a better delimiter, but the PHP driver uses underscore
Please sign in to comment.
Something went wrong with that request. Please try again.