From: Edward <edward@roojs.com>
Date: Fri, 12 Oct 2018 02:57:22 +0000 (+0800)
Subject: DataObjects/Images.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=c81b84e5570eb8f4e73c4a7912114e8f32a48b68

DataObjects/Images.php
---

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 96b7c880..4c1b9284 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,10 +830,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
-        if($rotate){
-            $data = $this->rotate();
-        }
-        
         if(!empty($scaleWidth) || !empty($scaleHeight)){
             
             $width = $this->width;
@@ -870,6 +866,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
         }
         
+        if($rotate){
+            $data = $this->rotate($data);
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;