tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 16:09:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4793 from jonom/image-properties

Browse Source 
FIX Image_Cached record class name
This commit is contained in:
Damian Mooyman 2015-12-22 10:09:05 +13:00
commit 880a3ef0ab
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
model/Image.php
View File

@ -1040,7 +1040,12 @@ class Image_Cached extends Image {
*/
public function __construct($filename = null, $isSingleton = false, Image $sourceImage = null) {
parent::__construct(array(), $isSingleton);
if ($sourceImage) $this->update($sourceImage->toMap());
if ($sourceImage) {
// Copy properties from source image, except unsafe ones
$properties = $sourceImage->toMap();
unset($properties['RecordClassName'], $properties['ClassName']);
$this->update($properties);
}
$this->ID = -1;
$this->Filename = $filename;
}