diff options
| author | plegall <plg@piwigo.org> | 2010-06-29 00:26:43 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-06-29 00:26:43 +0000 |
| commit | de5efe8330ecc09bd37fa93bd0c0560574591ba1 (patch) | |
| tree | 7b61341eef910b3b98dc85181d6aff592106ee4b /admin/include/functions_upload.inc.php | |
| parent | 4b4d79c2392ac17ff208b50bb8b051e1ca18137f (diff) | |
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
git-svn-id: http://piwigo.org/svn/trunk@6622 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include/functions_upload.inc.php')
| -rw-r--r-- | admin/include/functions_upload.inc.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php index a52142d0c..d1aed33ca 100644 --- a/admin/include/functions_upload.inc.php +++ b/admin/include/functions_upload.inc.php @@ -141,6 +141,10 @@ function add_uploaded_file($source_filepath, $original_filename=null, $categorie } // 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)); invalidate_user_cache(); |