DataObjects/Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 5884eab..1c0d86a 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -833,24 +833,30 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if($rotate){
             $data = $this->rotate();
         }
         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($scaleWidth)){
+                $width = $scaleWidth;

 
 

-            if(empty($scaleHeight)){
-                $height = $this->height * $scaleWidth / $this->width;
+                if(empty($scaleHeight)){
+                    $height = $this->height * $scaleWidth / $this->width;
+                }

             }
             }

-        }
-        
-        if(!empty($scaleHeight)){
-            $height = $scaleHeight;

 
 

-            if(empty($scaleWidth)){
-                $width = $this->width * $scaleHeight / $this->height;
+            if(!empty($scaleHeight)){
+                $height = $scaleHeight;
+
+                if(empty($scaleWidth)){
+                    $width = $this->width * $scaleHeight / $this->height;
+                }

             }
             }

+            
+            
+            

         }
         
         
         }