diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:10 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:10 +0200 |
| commit | 2fceb85c49142cd512c10080a3cd9ad067f0414c (patch) | |
| tree | 861162f9c4b8137d73045e6b71533946fbcfc108 /system/database/DB_result.php | |
| parent | 249204b67d9d437898198ad355d452f467f70dc3 (diff) | |
| parent | f46e726cfb726da2ec2095011ffe8625b6f9c816 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errors
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 |