Changeset 24835

Timestamp:

Oct 10, 2013, 1:09:51 PM (11 years ago)

Author:

mistic100

Message:

bug 2970: Division by zero on batch manager

File:

• trunk/admin/batch_manager.php (modified) (3 diffs)

trunk/admin/batch_manager.php

@@ -491 +491 @@
 $result = pwg_query($query);
 
-if (!pwg_db_num_rows($result))
+if (pwg_db_num_rows($result))
+{
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    if ($row['width']>0 && $row['height']>0)
+    {
+      $widths[] = $row['width'];
+      $heights[] = $row['height'];
+      $ratios[] = floor($row['width'] / $row['height'] * 100) / 100;
+    }
+  }
+}
+if (empty($widths))
 { // arbitrary values, only used when no photos on the gallery
   $widths = array(600, 1920, 3500);
@@ -497 +509 @@
   $ratios = array(1.25, 1.52, 1.78);
 }
-else
-{
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    $widths[] = $row['width'];
-    $heights[] = $row['height'];
-    $ratios[] = floor($row['width'] * 100 / $row['height']) / 100;
-  }
-}
+
 
 
@@ -564 +568 @@
     $dimensions['ratio_'.$ratio_category] = array(
       'min' => $ratio_categories[$ratio_category][0],
-      'max' => $ratio_categories[$ratio_category][count($ratio_categories[$ratio_category]) - 1]
+      'max' => array_pop($ratio_categories[$ratio_category]),
       );
   }