Changeset 6621 for branches/2.1/admin/photos_add_direct.php

Timestamp:

Jun 29, 2010, 2:18:40 AM (14 years ago)

Author:

plg

Message:

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

File:

• branches/2.1/admin/photos_add_direct.php (modified) (3 diffs)

branches/2.1/admin/photos_add_direct.php

@@ -444 +444 @@
 
 $setup_errors = array();
+$setup_warnings = array();
 
 $error_message = ready_for_upload_message();
@@ -454 +455 @@
 {
   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')
+    );
 }
 
@@ -459 +468 @@
     array(
       'setup_errors'=> $setup_errors,
+      'setup_warnings' => $setup_warnings,
     )
   );