diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 15:01:55 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 15:01:55 +0100 |
| commit | f7ec494c76accf123dcd657c01d80e0a24fbc7b7 (patch) | |
| tree | d3873aab681bd16de76ca20a29e80b5daa1ac7fb /system/database/drivers/sqlsrv | |
| parent | aa8a36acdbb31b0850747ddf0d2aaff0ab7e657f (diff) | |
| parent | 850f601edef5de5680510c900c3e613bc346fe1b (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/sqlsrv')
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_driver.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 9d61afc46..390554c7a 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -403,13 +403,9 @@ class CI_DB_sqlsrv_driver extends CI_DB { { return ''; } - elseif (isset($error['SQLSTATE'], $error['code'])) - { - return $error['SQLSTATE'].'/'.$error['code']; - } elseif (isset($error['SQLSTATE'])) { - return $error['SQLSTATE']; + return isset($error['code']) ? $error['SQLSTATE'].'/'.$error['code'] : $error['SQLSTATE']; } elseif (isset($error['code'])) { @@ -576,12 +572,5 @@ class CI_DB_sqlsrv_driver extends CI_DB { } -<<<<<<< HEAD /* End of file sqlsrv_driver.php */ /* Location: ./system/database/drivers/sqlsrv/sqlsrv_driver.php */ -======= - - -/* End of file mssql_driver.php */ -/* Location: ./system/database/drivers/mssql/mssql_driver.php */ ->>>>>>> upstream/develop |