Changeset 6622 for trunk/admin/include/functions_upload.inc.php

Timestamp:

Jun 29, 2010, 2:26:43 AM (14 years ago)

Author:

plg

Message:

merge r6621 from branch 2.1 to trunk

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:

• trunk/admin/include/functions_upload.inc.php (modified) (1 diff)

trunk/admin/include/functions_upload.inc.php

@@ -142 +142 @@
   
   // update metadata from the uploaded file (exif/iptc)
+  if ($conf['use_exif'] and !function_exists('read_exif_data'))
+  {
+    $conf['use_exif'] = false;
+  }
   update_metadata(array($image_id=>$file_path));