merge -c2427 from branch 1.7 to trunk

bug 802 fixed: if GD library is not available, display an explicit error, even before trying to generated any thumbnail. git-svn-id: http://piwigo.org/svn/trunk@2428 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jul 9, 2008 · 22ce08c · 22ce08c
1 parent 4624534
commit 22ce08c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/admin/thumbnail.php b/admin/thumbnail.php
@@ -151,6 +151,12 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext)
 
 $pictures = array();
 $stats = array();
+
+if (!function_exists('gd_info'))
+{
+  array_push($page['errors'], l10n('GD library is missing'));
+}
+
 // +-----------------------------------------------------------------------+
 // |                       template initialization                         |
 // +-----------------------------------------------------------------------+

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
@@ -648,5 +648,5 @@
 $lang['Deleted on'] = 'Deleted on';
 $lang['Last hit'] =  'Last hit';
 $lang['Hits'] = 'Hits';
-
+$lang['GD library is missing'] = 'GD library is missing';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
@@ -648,5 +648,5 @@
 $lang['Deleted on'] = 'Effacé le';
 $lang['Last hit'] =  'Dernier accès';
 $lang['Hits'] = 'Utilisations';
-
+$lang['GD library is missing'] = 'la bibliothèque GD est manquante';
 ?>