diff options
| author | plegall <plg@piwigo.org> | 2008-07-09 21:08:32 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2008-07-09 21:08:32 +0000 |
| commit | 22ce08c6fbc9f52152ac300156d72256d76a1d64 (patch) | |
| tree | 04e7a0e9a92323a43a16bed3d9c459812b856bba | |
| parent | 462453465b59675706e4bb305fc9a82977dbb5a9 (diff) | |
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
| -rw-r--r-- | admin/thumbnail.php | 6 | ||||
| -rw-r--r-- | language/en_UK/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/fr_FR/admin.lang.php | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/admin/thumbnail.php b/admin/thumbnail.php index 57ecf9cdb..a68395ce4 100644 --- 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 index 3d3a0a5f9..6f73d4b8d 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -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'; ?> diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index f8849d4dd..b1051c7a5 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -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'; ?> |