diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:33 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:33 +0200 |
| commit | ae9475557c1968826aee0fa5554899c8329412c2 (patch) | |
| tree | d457bcad3afa889602023b53a7e128a27e3ccf10 /system/database/DB_result.php | |
| parent | 4b5616d5dc6ce118a472333b59f23e6eaf735144 (diff) | |
| parent | f46e726cfb726da2ec2095011ffe8625b6f9c816 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/database/DB_result.php')
| -rw-r--r-- | system/database/DB_result.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 25b4fb911..690734b08 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -378,11 +378,10 @@ class CI_DB_result { public function unbuffered_row($type = 'object') { return ($type !== 'array') ? $this->_fetch_object() : $this->_fetch_assoc(); - } // -------------------------------------------------------------------- - + /** * The following functions are normally overloaded by the identically named * methods in the platform-specific driver -- except when query caching |