Merged revision(s) 24835 from trunk:

bug 2970: Division by zero on batch manager 

git-svn-id: http://piwigo.org/svn/branches/2.5@24880 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 15 insertions, 11 deletions

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index a5c82d061..b9dbe4de6 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -457,21 +457,25 @@ SELECT
 ;';
 $result = pwg_query($query);
 
-if (!pwg_db_num_rows($result))
-{ // arbitrary values, only used when no photos on the gallery
-  $widths = array(600, 1920, 3500);
-  $heights = array(480, 1080, 2300);
-  $ratios = array(1.25, 1.52, 1.78);
-}
-else
+if (pwg_db_num_rows($result))
 {
   while ($row = pwg_db_fetch_assoc($result))
   {
-    $widths[] = $row['width'];
-    $heights[] = $row['height'];
-    $ratios[] = floor($row['width'] * 100 / $row['height']) / 100;
+    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);
+  $heights = array(480, 1080, 2300);
+  $ratios = array(1.25, 1.52, 1.78);
+}
+
 
 
 $widths = array_unique($widths);
@@ -530,7 +534,7 @@ foreach (array_keys($ratio_categories) as $ratio_category)
   {
     $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]),
       );
   }
 }