diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2008-12-17 19:28:26 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2008-12-17 19:28:26 +0000 |
| commit | fe396410894f9fcf430e31216312f70db800d96e (patch) | |
| tree | fc1222c074e0f8ffd2d952688353f5bf79e360f5 /kohana/libraries/drivers/Database/Mssql.php | |
| parent | 093fb407a839b1bdacd0cd6036b349a42dcfea7d (diff) | |
Update Kohana code to r3799 from their svn head. All tests pass.
Resolved upstream tickets:
http://dev.kohanaphp.com/ticket/972
Command:
svn merge -c19275 vendor/kohana/modified/kohana trunk/kohana
Diffstat (limited to 'kohana/libraries/drivers/Database/Mssql.php')
| -rw-r--r-- | kohana/libraries/drivers/Database/Mssql.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kohana/libraries/drivers/Database/Mssql.php b/kohana/libraries/drivers/Database/Mssql.php index 644d4a13..401770a2 100644 --- a/kohana/libraries/drivers/Database/Mssql.php +++ b/kohana/libraries/drivers/Database/Mssql.php @@ -58,7 +58,9 @@ class Database_Mssql_Driver extends Database_Driver // Build the connection info $host = isset($host) ? $host : $socket; - $port = (isset($port) AND is_string($port)) ? ':'.$port : ''; + + // Windows uses a comma instead of a colon + $port = (isset($port) AND is_string($port)) ? (KOHANA_IS_WIN ? ',' : ':').$port : ''; // Make the connection and select the database if (($this->link = $connect($host.$port, $user, $pass, TRUE)) AND mssql_select_db($database, $this->link)) |