golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid infinite recursion when expiring cache. fixes #1875 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3086 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-11-14 21:29:30 +00:00
parent 1bf946e618
commit 60d04abb0c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/cache.php
View File

@ -75,11 +75,11 @@ class WP_Object_Cache {
return $this->set($id, $data, $group, $expire);
}
function delete($id, $group = 'default') {
function delete($id, $group = 'default', $force = false) {
if ( empty($group) )
$group = 'default';
if ( false === $this->get($id, $group, false) )
if ( !$force && false === $this->get($id, $group, false) )
return false;
unset ($this->cache[$group][$id]);
@ -128,7 +128,7 @@ class WP_Object_Cache {
$now = time();
if ( (filemtime($cache_file) + $this->expiration_time) <= $now ) {
$this->cache_misses += 1;
$this->delete($id, $group);
$this->delete($id, $group, true);
return false;
}