diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | system/database/DB_result.php | 2 | ||||
| -rw-r--r-- | system/libraries/Session.php | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index ab8a6a8e2..61f0d307f 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -234,9 +234,9 @@ class CI_DB_driver { { if ($this->_cache_init()) { + $this->load_rdriver(); if (FALSE !== ($cache = $this->CACHE->read($sql))) { - $this->load_rdriver(); return $cache; } } diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 44f166d21..7553c167f 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -63,7 +63,7 @@ class CI_DB_result { return $this->result_object; } - if ($this->numerous == 0) + if ($this->num_rows == 0) { return array(); } diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 96a0c43b2..c1fc345d9 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -110,8 +110,10 @@ class CI_Session { } } - // Do we need encryption? - if ($this->CI->config->item('sess_encrypt_cookie') == TRUE) + // Do we need encryption? + $this->encryption = $this->CI->config->item('sess_encrypt_cookie'); + + if ($this->encryption == TRUE) { $this->CI->load->library('encrypt'); } |