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
This commit is contained in:
plegall
2008-07-09 21:08:32 +00:00
parent 462453465b
commit 22ce08c6fb
3 changed files with 8 additions and 2 deletions
+6
View File
@@ -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 |
// +-----------------------------------------------------------------------+
+1 -1
View File
@@ -648,5 +648,5 @@ $lang['c13y_version_correction'] = 'You need to upgrade your system to take full
$lang['Deleted on'] = 'Deleted on';
$lang['Last hit'] = 'Last hit';
$lang['Hits'] = 'Hits';
$lang['GD library is missing'] = 'GD library is missing';
?>
+1 -1
View File
@@ -648,5 +648,5 @@ $lang['c13y_version_correction'] = 'Vous devez mettre à jour votre système pou
$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';
?>