DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 84b39c0..1c0d86a 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -838,11 +838,29 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $width = $this->width;
             $height = $this->height;
+
+            if(!empty($scaleWidth)){
+                $width = $scaleWidth;
+
+                if(empty($scaleHeight)){
+                    $height = $this->height * $scaleWidth / $this->width;
+                }
+            }
+
+            if(!empty($scaleHeight)){
+                $height = $scaleHeight;
+
+                if(empty($scaleWidth)){
+                    $width = $this->width * $scaleHeight / $this->height;
+                }
+            }
             
             
             
         }
         
+        
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;