mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-18 23:46:21 +02:00
Merge pull request #2366 from johannesx75/Cached-Images-Path2
BUG Cached images stored in wrong folder
This commit is contained in:
commit
eaa78b98b8
@ -425,6 +425,8 @@ class Image extends File {
|
|||||||
$cached = new Image_Cached($cacheFile);
|
$cached = new Image_Cached($cacheFile);
|
||||||
// Pass through the title so the templates can use it
|
// Pass through the title so the templates can use it
|
||||||
$cached->Title = $this->Title;
|
$cached->Title = $this->Title;
|
||||||
|
// Pass through the parent, to store cached images in correct folder.
|
||||||
|
$cached->ParentID = $this->ParentID;
|
||||||
return $cached;
|
return $cached;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -181,4 +181,37 @@ class ImageTest extends SapphireTest {
|
|||||||
$image->deleteFormattedImages();
|
$image->deleteFormattedImages();
|
||||||
$this->assertFalse(file_exists($p));
|
$this->assertFalse(file_exists($p));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests that generated images with multiple image manipulations are all deleted
|
||||||
|
*/
|
||||||
|
public function testMultipleGenerateManipulationCallsImageDeletion() {
|
||||||
|
$image = $this->objFromFixture('Image', 'imageWithMetacharacters');
|
||||||
|
|
||||||
|
$firstImage = $image->SetWidth(200);
|
||||||
|
$firstImagePath = $firstImage->getFullPath();
|
||||||
|
$this->assertTrue(file_exists($firstImagePath));
|
||||||
|
|
||||||
|
$secondImage = $firstImage->SetHeight(100);
|
||||||
|
$secondImagePath = $secondImage->getFullPath();
|
||||||
|
$this->assertTrue(file_exists($secondImagePath));
|
||||||
|
|
||||||
|
$image->deleteFormattedImages();
|
||||||
|
$this->assertFalse(file_exists($firstImagePath));
|
||||||
|
$this->assertFalse(file_exists($secondImagePath));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests path properties of cached images with multiple image manipulations
|
||||||
|
*/
|
||||||
|
public function testPathPropertiesCachedImage() {
|
||||||
|
$image = $this->objFromFixture('Image', 'imageWithMetacharacters');
|
||||||
|
$firstImage = $image->SetWidth(200);
|
||||||
|
$firstImagePath = $firstImage->getRelativePath();
|
||||||
|
$this->assertEquals($firstImagePath, $firstImage->Filename);
|
||||||
|
|
||||||
|
$secondImage = $firstImage->SetHeight(100);
|
||||||
|
$secondImagePath = $secondImage->getRelativePath();
|
||||||
|
$this->assertEquals($secondImagePath, $secondImage->Filename);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user