diff options
| author | Andrey Andreev <narf@devilix.net> | 2018-06-15 12:50:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2018-06-15 12:50:16 +0200 |
| commit | d0d4548c4b6917a3e389fb97acbc6123e2060ae2 (patch) | |
| tree | fc1afe7c0ad862e96c61313e7fc856d21f345107 | |
| parent | b3f7aae1079e8e484437bc67f4c126f34e7903d8 (diff) | |
| parent | 800a20d6c4662d99ae0988b2f8f2238bb8bb29db (diff) | |
Merge branch '3.1-stable' into develop
| -rw-r--r-- | system/libraries/Session/drivers/Session_memcached_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php index efc084d8b..3bde6514e 100644 --- a/system/libraries/Session/drivers/Session_memcached_driver.php +++ b/system/libraries/Session/drivers/Session_memcached_driver.php @@ -305,7 +305,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa */ public function validateId($id) { - $this->_memcached-get($this->_key_prefix.$id); + $this->_memcached->get($this->_key_prefix.$id); return ($this->_memcached->getResultCode() === Memcached::RES_SUCCESS); } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 9367e9c0e..766da7587 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,7 +2,6 @@ Change Log ########## -<<<<<<< HEAD Version 3.2.0 ============= @@ -127,12 +126,14 @@ Release Date: Not Released - Added 'img_alt' option with a default value of 'captcha'. - Added ability to generate ``data:image/png;base64`` URIs instead of writing image files to disk. - Updated to always create PNG images instead of JPEG. -======= + Version 3.1.10 ============== ->>>>>>> 3.1-stable +Bug fixes for 3.1.10 +-------------------- +- Fixed a bug (#5526) - :doc:`Session Library <libraries/sessions>` had a syntax error in its 'memcached' driver. Version 3.1.9 ============= |