tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX #2719 Image::deleteFormattedImages() doesn't delete all formatted images properly (banal)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77276 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-19 23:42:40 +00:00
parent 8c5eb9bcc6
commit 5e8b144318
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/model/Image.php
View File

@ -340,26 +340,47 @@ class Image extends File {
}
/**
* Remove all of the formatted cached images.
* Should be called by any method that updates the current image.
* Remove all of the formatted cached images for this image.
* @return int The number of formatted images deleted
*/
public function deleteFormattedImages() {
if($this->Filename) {
$numDeleted = 0;
$methodNames = $this->allMethodNames();
$numDeleted = 0;
foreach($methodNames as $methodName) {
if(substr($methodName,0,8) == 'generate') {
$format = substr($methodName,8);
$cacheFile = $this->cacheFilename($format);
if(Director::fileExists($cacheFile)) {
unlink(Director::getAbsFile($cacheFile));
$numDeleted++;
if(!$this->Filename) return 0;
$numDeleted = 0;
$methodNames = $this->allMethodNames();
$cachedFiles = array();
$folder = $this->ParentID ? $this->Parent()->Filename : 'assets/';
$cacheDir = Director::getAbsFile($folder . '_resampled/');
if(is_dir($cacheDir)) {
if($handle = opendir($cacheDir)) {
while(($file = readdir($handle)) !== false) {
// ignore all entries starting with a dot
if(substr($file, 0, 1) != '.' && is_file($cacheDir . $file)) {
$cachedFiles[] = $file;
}
}
closedir($handle);
}
}
foreach($methodNames as $methodName) {
if(substr($methodName, 0, 8) == 'generate') {
$format = substr($methodName, 8);
$pattern = '/^' . $format . '[^\-]*\-' . $this->Name . '$/';
foreach($cachedFiles as $cfile) {
if(preg_match($pattern, $cfile)) {
if(Director::fileExists($cacheDir . $cfile)) {
unlink($cacheDir . $cfile);
$numDeleted++;
}
}
}
}
return $numDeleted;
}
return $numDeleted;
}
/**