- multisize thumb longest side can be smaller than the square size

- remove unused css, shorten/optimize php called very often (at least theoretically should be faster)

git-svn-id: http://piwigo.org/svn/trunk@13240 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 30 insertions, 10 deletions

diff --git a/admin/derivatives.php b/admin/derivatives.php
index 556ff7fec..283dceb72 100644
--- a/admin/derivatives.php
+++ b/admin/derivatives.php
@@ -52,16 +52,36 @@ if ( isset($_POST['d']) )
     if (!$pderivative['enabled'])
       continue;
 
-    $v = intval($pderivative['w']);
-    if ($v<=0 || $v<=$prev_w)
-    {
-      $errors[$type]['w'] = '>'.$prev_w;
-    }
-    $v = intval($pderivative['h']);
-    if ($v<=0 || $v<=$prev_h)
-    {
-      $errors[$type]['h'] = '>'.$prev_h;
-    }
+		if ($type==IMG_THUMB)
+		{
+			$w = intval($pderivative['w']);
+			if ($w<=0)
+			{
+				$errors[$type]['w'] = '>0';
+			}
+			$h = intval($pderivative['h']);
+			if ($h<=0)
+			{
+				$errors[$type]['h'] = '>0';
+			}
+			if (max($w,$h) <= $prev_w)
+			{
+				$errors[$type]['w'] = $errors[$type]['h'] = '>'.$prev_w;
+			}
+		}
+		else
+		{
+			$v = intval($pderivative['w']);
+			if ($v<=0 || $v<=$prev_w)
+			{
+				$errors[$type]['w'] = '>'.$prev_w;
+			}
+			$v = intval($pderivative['h']);
+			if ($v<=0 || $v<=$prev_h)
+			{
+				$errors[$type]['h'] = '>'.$prev_h;
+			}
+		}
     $v = intval($pderivative['crop']);
     if ($v<0 || $v>100)
     {