diff options
| author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-03-04 10:04:25 +0100 |
|---|---|---|
| committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-03-04 10:04:25 +0100 |
| commit | e5d7af508680afced4c96b5a52a054c73b6c537e (patch) | |
| tree | 133b6f7791b975bfc6ecb017ba3a8d862cdecb6c /system/database/DB_result.php | |
| parent | 3b5b7f48848d098c6190781f8790a1b0dcb0217c (diff) | |
| parent | 5780d8b2078126f8eb5738658fceadd38c66fe5b (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'system/database/DB_result.php')
| -rw-r--r-- | system/database/DB_result.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/system/database/DB_result.php b/system/database/DB_result.php index a044fd5dc..41a851777 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -478,12 +478,9 @@ class CI_DB_result { return NULL; } - if (isset($result[$this->current_row + 1])) - { - ++$this->current_row; - } - - return $result[$this->current_row]; + return isset($result[$this->current_row + 1]) + ? $result[++$this->current_row] + : NULL; } // -------------------------------------------------------------------- |