From: Edward <edward@roojs.com>
Date: Thu, 4 Oct 2018 03:00:35 +0000 (+0800)
Subject: DataObjects/Images.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=af03fd6870719bae1c4fb84f854f0647e2ef17e1

DataObjects/Images.php
---

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 84b39c02..4edf3480 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -833,14 +833,17 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if($rotate){
             $data = $this->rotate();
         }
-        
-        if(!empty($scaleWidth) || !empty($scaleHeight)){
-            
-            $width = $this->width;
-            $height = $this->height;
-            
-            
             
+        $width = $this->width;
+        $height = $this->height;
+
+        if(!empty($scaleWidth)){
+            $width = $scaleWidth;
+
+            if(empty($scaleHeight)){
+                $height = $this->height * $scaleWidth / $this->width;
+            }
+
         }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);