Merge pull request #1667 from alexispeter/image-exif-resize

Extract image-manipulation from CM_File_Image
cargomedia · Jul 17, 2015 · f27a657 · f27a657
2 parents 218b66f + 33b34c9
commit f27a657
Show file tree

Hide file tree

Showing 8 changed files with 799 additions and 774 deletions.
diff --git a/library/CM/File/Image.php b/library/CM/File/Image.php
diff --git a/library/CM/FormField/FileImage.php b/library/CM/FormField/FileImage.php
@@ -6,8 +6,8 @@ public function validateFile(CM_File $file) {
         parent::validateFile($file);
 
         try {
-            $image = new CM_File_Image($file);
-            $image->validateImage();
+            $image = new CM_Image_Image($file->read());
+            $image->validate();
         } catch (CM_Exception $e) {
             throw new CM_Exception_FormFieldValidation('Invalid image');
         }