Skip to content

Commit

Permalink
Adding fix for tests in previous commit. Fixes #596
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Apr 17, 2010
1 parent 1fee86f commit 5ed5c54
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion cake/libs/cache.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@ function set($settings = array(), $value = null) {
return false; return false;
} }


$engine = $_this->__config[$_this->__name]['engine']; $engine = $_this->__config[$_this->__name]['engine'];
if (isset($settings['engine'])) {
$engine = $settings['engine'];
}


if (!empty($settings)) { if (!empty($settings)) {
$_this->__reset = true; $_this->__reset = true;
Expand Down Expand Up @@ -289,6 +292,7 @@ function read($key, $config = null) {
if (!$key = $_this->_Engine[$engine]->key($key)) { if (!$key = $_this->_Engine[$engine]->key($key)) {
return false; return false;
} }

$success = $_this->_Engine[$engine]->read($settings['prefix'] . $key); $success = $_this->_Engine[$engine]->read($settings['prefix'] . $key);


if ($config !== null && $config !== $_this->__name) { if ($config !== null && $config !== $_this->__name) {
Expand Down

0 comments on commit 5ed5c54

Please sign in to comment.