Commit cc9929e5 authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'master' into develop

parents 1a33a13a fd128976
...@@ -30,7 +30,7 @@ class SQLServer extends Connector { ...@@ -30,7 +30,7 @@ class SQLServer extends Connector {
$port = (isset($port)) ? ','.$port : ''; $port = (isset($port)) ? ','.$port : '';
//check for dblib for mac users connecting to mssql (utilizes freetds) //check for dblib for mac users connecting to mssql (utilizes freetds)
if (!empty($dsn_type) and $dsn_type == 'dblib') if (in_array('dblib',PDO::getAvailableDrivers()))
{ {
$dsn = "dblib:host={$host}{$port};dbname={$database}"; $dsn = "dblib:host={$host}{$port};dbname={$database}";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment