diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-07-08 21:43:22 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-07-08 21:43:22 +0200 |
commit | adedaf05449112a5ede4a3bc722a9a153b4aa2a3 (patch) | |
tree | d9e6a538e140b5076a926151bbe261a960e84417 /system/database/drivers/sqlsrv/sqlsrv_result.php | |
parent | bd6116a63899c5efcf35e175b3db14b1f05c60a9 (diff) | |
parent | 0db81b6c82c2f86a6e9da26ab5501ba65cb4c4e1 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_subdrivers
Diffstat (limited to 'system/database/drivers/sqlsrv/sqlsrv_result.php')
-rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_result.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php index d469ff470..fb7a68647 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_result.php +++ b/system/database/drivers/sqlsrv/sqlsrv_result.php @@ -145,11 +145,12 @@ class CI_DB_sqlsrv_result extends CI_DB_result { * * Returns the result set as an object * + * @param string * @return object */ - protected function _fetch_object() + protected function _fetch_object($class_name = 'stdClass') { - return sqlsrv_fetch_object($this->result_id); + return sqlsrv_fetch_object($this->result_id, $class_name); } } |