diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-12 19:51:39 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-12 19:51:39 +0200 |
| commit | f83c4363b5459d294255e3817a230258861ec79b (patch) | |
| tree | e88929ac21246cab365d865ccc82aed56663a414 /system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php | |
| parent | a23e10fd2369cc85c4b942c5de6a8cf05a5b2b67 (diff) | |
| parent | 98ebf4351f8aad58504cd7318ddd94faf0dec482 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_qb_aliasing
Diffstat (limited to 'system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php')
| -rw-r--r-- | system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php index 5b1cd9789..64be355f8 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php @@ -78,9 +78,9 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver { $this->dsn .= ';ConnectionPooling='.$this->ConnectionPooling; } - if (isset($this->Encrypt)) + if ($this->encrypt === TRUE) { - $this->dsn .= ';Encrypt='.$this->Encrypt; + $this->dsn .= ';Encrypt=1'; } if (isset($this->TraceOn)) |