Permalink
Browse files

fixing cache error

  • Loading branch information...
1 parent 47d50b1 commit b2f7cd5aff09b504dbb08acd274e88a9017cd14a gwoo committed Aug 3, 2009
Showing with 2 additions and 3 deletions.
  1. +2 −3 cake/libs/cache.php
View
@@ -136,8 +136,8 @@ function config($name = null, $settings = array()) {
return false;
}
$settings = $_this->__config[$name] = $_this->settings($engine);
- } else {
- $settings = $_this->__config[$name] = $_this->set($_this->__config[$name]);
+ } else if ($settings = $_this->set($_this->__config[$name])) {
+ $_this->__config[$name] = $settings;
}
return compact('engine', 'settings');
}
@@ -188,7 +188,6 @@ function set($settings = array(), $value = null) {
}
$engine = $_this->__config[$_this->__name]['engine'];
-
if (!empty($settings)) {
$_this->__reset = true;
}

0 comments on commit b2f7cd5

Please sign in to comment.