summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-04-01 20:11:23 +0200
committerAndrey Andreev <narf@devilix.net>2016-04-01 20:11:23 +0200
commitf8312cfa38d2793f1b365f918395019f343fe1c0 (patch)
tree769396c7edc92ce5f8a8817256abdcc675d6478f
parentb97e6b2e7e2f58aa7bba937b96dd2e9d3089e4d2 (diff)
[ci skip] Fix #4562
-rw-r--r--system/libraries/Cache/drivers/Cache_memcached.php2
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index 6dee1e8e4..836336d46 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -295,7 +295,7 @@ class CI_Cache_memcached extends CI_Driver {
{
$this->_memcached->close();
}
- elseif ($this->_memcached instanceof Memcached)
+ elseif ($this->_memcached instanceof Memcached && method_exists($this->_memcached, 'quit'))
{
$this->_memcached->quit();
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3cef6b66c..1f8866089 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -23,6 +23,7 @@ Bug fixes for 3.0.7
- Fixed a bug where :doc:`Image Manipulation Library <libraries/image_lib>` didn't escape image source paths passed to ImageMagick as shell arguments.
- Fixed a bug (#861) - :doc:`Database Forge <database/forge>` method ``create_table()`` incorrectly accepts field width constraints for MSSQL/SQLSRV integer-type columns.
+- Fixed a bug (#4562) - :doc:`Cache Library <libraries/caching>` didn't check if ``Memcached::quit()`` is available before calling it.
Version 3.0.6
=============