aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-02-13 12:49:52 +0000
committerplegall <plg@piwigo.org>2005-02-13 12:49:52 +0000
commit11cf1e01f778ee8c07965d56412f767341158fbc (patch)
treed9ad1b8c59171d01e276acd70c1e2f01d8359a3a
parentabfbb7f706e8b32974ee5d829f16464bbe1c4792 (diff)
- bug fixed : instead of showing a blank page when trying to use Exif tags
read function, display a message telling the problem git-svn-id: http://piwigo.org/svn/trunk@738 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions_metadata.php5
-rw-r--r--picture.php5
2 files changed, 10 insertions, 0 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 8e2d27a16..ad45aca12 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -84,6 +84,11 @@ function update_metadata($files)
if ($conf['use_exif'])
{
+ if (!function_exists('read_exif_data'))
+ {
+ die('Exif extension not available, admin should disable exif use');
+ }
+
if ($exif = @read_exif_data($file))
{
if (isset($exif['DateTime']))
diff --git a/picture.php b/picture.php
index 7028da435..22d86fd72 100644
--- a/picture.php
+++ b/picture.php
@@ -803,6 +803,11 @@ if ($metadata_showable and isset($_GET['show_metadata']))
$template->assign_block_vars('metadata', array());
if ($conf['show_exif'])
{
+ if (!function_exists('read_exif_data'))
+ {
+ die('Exif extension not available, admin should disable exif display');
+ }
+
if ($exif = @read_exif_data($picture['current']['src']))
{
$template->assign_block_vars(