From 88e5d14c3c9b1be8a49eb443b4fb791b01a230b4 Mon Sep 17 00:00:00 2001 From: gwoo Date: Thu, 9 Oct 2008 23:24:28 +0000 Subject: [PATCH] small fix to the Cache::read() use of Cache::set() when using default configuration git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7723 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/cache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/cache.php b/cake/libs/cache.php index 7d560f798..428ed0e22 100644 --- a/cake/libs/cache.php +++ b/cake/libs/cache.php @@ -175,7 +175,7 @@ class Cache extends Object { * * @param mixed $settings Optional string for simple name-value pair or array * @param string $value Optional for a simple name-value pair - * @return array of settings + * @return array of settings * @access public * @static */ @@ -311,7 +311,7 @@ class Cache extends Object { } $success = $_this->_Engine[$engine]->read($settings['prefix'] . $key); - if ($config !== $_this->__name) { + if ($config !== null && $config !== $_this->__name) { $settings = $_this->set(); } return $success;