Merge branch 'dev'

Quiqqer/Engine/plugins_qui/function.image.php

@@ -243,22 +243,35 @@ function smarty_function_image($params, $smarty)
 
     $maxWidth  = '';
     $maxHeight = '';
+    $ratio = false;
 
     try {
         $maxWidth  = $Image->getWidth();
         $maxHeight = $Image->getHeight();
+
+        if ($maxWidth && $maxHeight) {
+            $ratio = round($maxWidth / $maxHeight);
+        }
     } catch (Exception $Exception) {
         QUI\System\Log::addDebug($Exception->getMessage());
     }
 
-    if (empty($params['width']) || $params['width'] > $maxWidth) {
+    if (isset($params['width']) && $params['width'] > $maxWidth) {
         $params['width'] = $maxWidth;
     }
 
-    if (empty($params['height']) || $params['height'] > $maxHeight) {
+    if (isset($params['height']) && $params['height'] > $maxHeight) {
         $params['height'] = $maxHeight;
     }
 
+    if ($ratio && empty($params['width']) && !empty($params['height'])) {
+        $params['width'] = $params['height'] * $ratio;
+    }
+
+    if ($ratio && empty($params['height']) && !empty($params['width'])) {
+        $params['height'] = $params['width'] * $ratio;
+    }
+
     switch ($params['type']) {
         default:
         case 'resize':