adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating cache some more

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5803 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-10-19 16:22:59 +00:00
parent a6822f5d63
commit 981b8fed56
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
cake/libs/cache.php
View file

@ -58,7 +58,7 @@ class Cache extends Object {
* @var array * @var array
* @access private * @access private
*/ */
var $__currentConfig = null; var $__name = null;
/** /**
* Returns a singleton instance * Returns a singleton instance
* *
@ -99,30 +99,33 @@ class Cache extends Object {
*/ */
function config($name = 'default', $settings = array()) { function config($name = 'default', $settings = array()) {
$_this =& Cache::getInstance(); $_this =& Cache::getInstance();
if(is_array($name)) { if (is_array($name)) {
extract($name); extract($name);
} }
if(isset($_this->__config[$name])) { if (isset($_this->__config[$name])) {
$settings = array_merge($_this->__config[$name], $settings); $settings = array_merge($_this->__config[$name], $settings);
} elseif (is_string($name) && !empty($settings)) { } elseif (!empty($settings)) {
$_this->__config[$name] = $settings; $_this->__config[$name] = $settings;
} elseif ($_this->__name !== null && isset($_this->__config[$_this->__name])) {
$name = $_this->__name;
$settings = $_this->__config[$_this->__name];
} else { } else {
$name = 'default'; $name = 'default';
$settings = $_this->__config['default']; $settings = $_this->__config['default'];
} }
$engine = 'File'; $engine = 'File';
if(!empty($settings['engine'])) { if (!empty($settings['engine'])) {
$engine = $settings['engine']; $engine = $settings['engine'];
} }
if($name !== $_this->__currentConfig) { if ($name !== $_this->__name) {
if($_this->engine($engine, $settings) === false) { if ($_this->engine($engine, $settings) === false) {
return false; return false;
} }
$_this->__currentConfig = $name; $_this->__name = $name;
$_this->__config[$name] = array_merge(array('engine' => $engine), $_this->settings($engine)); $_this->__config[$name] = $_this->settings($engine);
} }
$settings = $_this->__config[$name]; $settings = $_this->__config[$name];
@ -171,7 +174,7 @@ class Cache extends Object {
*/ */
function write($key, $value, $duration = null) { function write($key, $value, $duration = null) {
$_this =& Cache::getInstance(); $_this =& Cache::getInstance();
if(is_array($duration)) { if (is_array($duration)) {
extract($duration); extract($duration);
} else { } else {
$config = $duration; $config = $duration;
@ -192,7 +195,7 @@ class Cache extends Object {
return false; return false;
} }
if(!$duration) { if (!$duration) {
$duration = $settings['duration']; $duration = $settings['duration'];
} }
@ -287,8 +290,8 @@ class Cache extends Object {
return false; return false;
} }
$_this =& Cache::getInstance(); $_this =& Cache::getInstance();
if(!$engine && $_this->__currentConfig !== null) { if (!$engine && isset($_this->__config[$_this->__name]['engine'])) {
$engine = $_this->__config[$_this->__currentConfig]['engine']; $engine = $_this->__config[$_this->__name]['engine'];
} }
return isset($_this->_Engine[$engine]); return isset($_this->_Engine[$engine]);
} }
@ -300,10 +303,10 @@ class Cache extends Object {
* @return array list of settings for this engine * @return array list of settings for this engine
* @access public * @access public
*/ */
function settings($engine = 'File') { function settings($engine = null) {
$_this =& Cache::getInstance(); $_this =& Cache::getInstance();
if(!$engine && isset($_this->__config[$_this->__currentConfig]['engine'])) { if (!$engine && isset($_this->__config[$_this->__name]['engine'])) {
$engine = $_this->__config[$_this->__currentConfig]['engine']; $engine = $_this->__config[$_this->__name]['engine'];
} }
if (isset($_this->_Engine[$engine]) && !is_null($_this->_Engine[$engine])) { if (isset($_this->_Engine[$engine]) && !is_null($_this->_Engine[$engine])) {
return $_this->_Engine[$engine]->settings(); return $_this->_Engine[$engine]->settings();