diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-03-07 19:25:41 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-03-07 19:25:41 +0100 |
| commit | 99776058b0a08865e75efb7380fdbc2de234f26e (patch) | |
| tree | 35fa8a631375c3d3b42720fbd64fd962931c00fe | |
| parent | e8c912cb2dfb7a9cb21ea455a206925d6c56dcbf (diff) | |
| parent | 54bf154629e4fffa5adce4283963f44b0a7e8ed7 (diff) | |
Merge pull request #3650 from jim-parry/fix/housekeeping
[ci skip] Housekeeping.
| -rw-r--r-- | readme.rst | 5 | ||||
| -rw-r--r-- | system/libraries/Session/drivers/Session_memcached_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/sessions.rst | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/readme.rst b/readme.rst index dd59fd8c1..640dd241b 100644 --- a/readme.rst +++ b/readme.rst @@ -54,13 +54,16 @@ Resources ********* - `User Guide <http://www.codeigniter.com/docs>`_ +- `Language File Translations <https://github.com/bcit-ci/codeigniter3-translations>`_ - `Community Forums <http://forum.codeigniter.com/>`_ - `Community Wiki <https://github.com/bcit-ci/CodeIgniter/wiki>`_ - `Community IRC <http://www.codeigniter.com/irc>`_ +Report security issues to our `Security Panel <mailto:security@codeigniter.com>`_, thank you. + *************** Acknowledgement *************** -The EllisLab team and The Reactor Engineers would like to thank all the +The CodeIgniter team would like to thank EllisLab, all the contributors to the CodeIgniter project and you, the CodeIgniter user.
\ No newline at end of file diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php index 938a612d9..c7185ee44 100644 --- a/system/libraries/Session/drivers/Session_memcached_driver.php +++ b/system/libraries/Session/drivers/Session_memcached_driver.php @@ -326,7 +326,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa if ($attempt === 30) { - log_message('error', 'Session: Unable to obtain lock for '.$this->_key_prefix.$session_id.' after 5 attempts, aborting.'); + log_message('error', 'Session: Unable to obtain lock for '.$this->_key_prefix.$session_id.' after 30 attempts, aborting.'); return FALSE; } diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 104adb631..51ecc03bd 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -363,7 +363,7 @@ To read a tempdata variable, again you can just access it through the .. important:: The ``userdata()`` method will NOT return tempdata items. -Or if you want to be sure that you're reading "flashdata" (and not any +Or if you want to be sure that you're reading "tempdata" (and not any other kind), you can also use the ``tempdata()`` method:: $this->session->tempdata('item'); |