From 61ad68f1e6e77196ac28bca0c57441f0c38ef90b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 12 May 2009 02:12:39 +0000
Subject: Deal gracefully with the case that the Gallery 2 instance didn't have
 any resizes (or thumbnails).

Fix a case where we were over-weighting the max dimension for square
resizes and thumbs.
---
 modules/g2_import/views/admin_g2_import.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/g2_import/views')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 838e3a45..8b6d069e 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -43,7 +43,7 @@
     </ul>
   </div>
 
-  <? if ($thumb_size != $g2_sizes["thumb"]["size"]): ?>
+  <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
   <div class="gWarning">
     <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
         array("g2_pixels" => $g2_sizes["thumb"]["size"],
@@ -52,7 +52,7 @@
   </div>
   <? endif ?>
 
-  <? if ($resize_size != $g2_sizes["resize"]["size"]): ?>
+  <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
   <div class="gWarning">
     <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
         array("g2_pixels" => $g2_sizes["resize"]["size"],
-- 
cgit v1.2.3