Changeset 2428


Ignore:
Timestamp:
Jul 9, 2008, 11:08:32 PM (16 years ago)
Author:
plg
Message:

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.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/thumbnail.php

    r2299 r2428  
    152152$pictures = array();
    153153$stats = array();
     154
     155if (!function_exists('gd_info'))
     156{
     157  array_push($page['errors'], l10n('GD library is missing'));
     158}
     159
    154160// +-----------------------------------------------------------------------+
    155161// |                       template initialization                         |

  • trunk/language/en_UK/admin.lang.php

    r2421 r2428  
    649649$lang['Last hit'] =  'Last hit';
    650650$lang['Hits'] = 'Hits';
    651 
     651$lang['GD library is missing'] = 'GD library is missing';
    652652?>

  • trunk/language/fr_FR/admin.lang.php

    r2421 r2428  
    649649$lang['Last hit'] =  'Dernier accès';
    650650$lang['Hits'] = 'Utilisations';
    651 
     651$lang['GD library is missing'] = 'la bibliothèque GD est manquante';
    652652?>
Note: See TracChangeset for help on using the changeset viewer.