diff options
| author | brian978 <dbrian89@yahoo.com> | 2012-12-18 12:23:14 +0100 |
|---|---|---|
| committer | brian978 <dbrian89@yahoo.com> | 2012-12-18 12:23:14 +0100 |
| commit | 0fb101849e53593fdceb7064f32ea5176e6eed16 (patch) | |
| tree | e33629f2352da2715d559364af955d6dda59d203 /system/libraries/Session/drivers | |
| parent | 07ccbe59cf9d78d944551f810a14064e979840a3 (diff) | |
| parent | d8dba5d3ecbe1ff4502b04a9cf3086908db140d1 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Session/drivers')
| -rw-r--r-- | system/libraries/Session/drivers/Session_cookie.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php index 6d926ae3d..9392a4dbe 100644 --- a/system/libraries/Session/drivers/Session_cookie.php +++ b/system/libraries/Session/drivers/Session_cookie.php @@ -457,7 +457,7 @@ class CI_Session_cookie extends CI_Session_driver { } // No result? Kill it! - if ($query->num_rows() === 0) + if (empty($query) OR $query->num_rows() === 0) { $this->sess_destroy(); return FALSE; |