Changeset 13240 for trunk/admin

Timestamp:

Feb 18, 2012, 9:46:46 PM (12 years ago)

Author:

rvelices

Message:

• 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)

Location:

trunk/admin

Files:

• comments.php (modified) (1 diff)
• derivatives.php (modified) (1 diff)

trunk/admin/comments.php

@@ -127 +127 @@
         'id'=>$row['image_id'],
         'path'=>$row['path'],
-        'tn_ext'=>@$row['tn_ext']
         )
      );

trunk/admin/derivatives.php

@@ -53 +53 @@
       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)