From 2bccd339a61f55060cb88c33006c708f1c5aab98 Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 29 Jun 2010 00:18:40 +0000 Subject: bug 1742 fixed: if the EXIF functions are not available: 1) display a warning (but not an error) 2) avoid to try to read EXIF data git-svn-id: http://piwigo.org/svn/branches/2.1@6621 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/photos_add_direct.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'admin/photos_add_direct.php') diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php index 7d094755d..6a7aea884 100644 --- a/admin/photos_add_direct.php +++ b/admin/photos_add_direct.php @@ -443,6 +443,7 @@ $template->assign( // +-----------------------------------------------------------------------+ $setup_errors = array(); +$setup_warnings = array(); $error_message = ready_for_upload_message(); if (!empty($error_message)) @@ -455,9 +456,18 @@ if (!function_exists('gd_info')) array_push($setup_errors, l10n('GD library is missing')); } +if ($conf['use_exif'] and !function_exists('read_exif_data')) +{ + array_push( + $setup_warnings, + l10n('Exif extension not available, admin should disable exif use') + ); +} + $template->assign( array( 'setup_errors'=> $setup_errors, + 'setup_warnings' => $setup_warnings, ) ); -- cgit v1.2.3