summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Session/drivers/Session_memcached_driver.php2
-rw-r--r--user_guide_src/source/changelog.rst7
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
=============