Changeset 3086

Show
Ignore:
Timestamp:
11/14/05 21:29:30 (3 years ago)
Author:
ryan
Message:

Avoid infinite recursion when expiring cache. fixes #1875

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/cache.php

    r3062 r3086  
    7676    } 
    7777 
    78     function delete($id, $group = 'default') { 
    79         if ( empty($group) ) 
    80             $group = 'default'; 
    81  
    82         if ( false === $this->get($id, $group, false) ) 
     78    function delete($id, $group = 'default', $force = false) { 
     79        if ( empty($group) ) 
     80            $group = 'default'; 
     81 
     82        if ( !$force && false === $this->get($id, $group, false) ) 
    8383            return false; 
    8484 
    …… 
    129129        if ( (filemtime($cache_file) + $this->expiration_time) <= $now ) { 
    130130            $this->cache_misses += 1; 
    131             $this->delete($id, $group); 
     131            $this->delete($id, $group, true); 
    132132            return false; 
    133133        }