diff options
| author | Heesung Ahn <ahn.heesung@gmail.com> | 2015-03-05 16:49:11 +0100 |
|---|---|---|
| committer | Heesung Ahn <ahn.heesung@gmail.com> | 2015-03-05 16:49:11 +0100 |
| commit | 7b0e60b085e35363bd9ab9150f62227f74711f2a (patch) | |
| tree | e30dd7f4171c83e19a32d197a078f6a1daf0d658 /user_guide_src/source | |
| parent | 4b25348e06a7587c64b97811208352c5c9478ab8 (diff) | |
| parent | 137aa20e0b0fd71ff8f672c57c07c4972c91c6a4 (diff) | |
Merge origin/develop into CI_Security_test
Diffstat (limited to 'user_guide_src/source')
| -rw-r--r-- | user_guide_src/source/database/results.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/sessions.rst | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst index a22c2e8c3..ac44566d3 100644 --- a/user_guide_src/source/database/results.rst +++ b/user_guide_src/source/database/results.rst @@ -102,7 +102,7 @@ You can also add a second String parameter, which is the name of a class to instantiate the row with:: $query = $this->db->query("SELECT * FROM users LIMIT 1;"); - $query->row(0, 'User'); + $row = $query->row(0, 'User'); echo $row->name; // access attributes echo $row->reverse_name(); // or methods defined on the 'User' class @@ -431,4 +431,4 @@ Class Reference :rtype: array Returns an array containing the field names in the - result set.
\ No newline at end of file + result set. diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 9fc33247b..104adb631 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -632,8 +632,7 @@ Redis Driver .. note:: Since Redis doesn't have a locking mechanism exposed, locks for this driver are emulated by a separate value that is kept for up - to 5 seconds. You may experience issues if your page loads take - longer than that! + to 300 seconds. Redis is a storage engine typically used for caching and popular because of its high performance, which is also probably your reason to use the @@ -670,8 +669,7 @@ Memcached Driver .. note:: Since Memcache doesn't have a locking mechanism exposed, locks for this driver are emulated by a separate value that is kept for - up to 5 seconds. You may experience issues if your page loads take - longer than that! + up to 300 seconds. The 'memcached' driver is very similar to the 'redis' one in all of its properties, except perhaps for availability, because PHP's `Memcached |