From 15ae37cf0351b654b5115183ab5a991c316e17e0 Mon Sep 17 00:00:00 2001
From: Jonathon Menz <jonomenz@gmail.com>
Date: Tue, 24 Nov 2015 10:49:31 -0800
Subject: [PATCH] FIX Image_Cached record class name

Sanitise properties before updating
---
 model/Image.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/model/Image.php b/model/Image.php
index 10b2ae7fb..b1f66ce97 100644
--- a/model/Image.php
+++ b/model/Image.php
@@ -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;
 	}