aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-12-28 00:06:06 +0000
committerrub <rub@piwigo.org>2006-12-28 00:06:06 +0000
commit4a4f72cbc359b9aff80a60c71882f5f78aa996a1 (patch)
treeb72254d662b73f291dfacfdfbcbcdfed2a98f3c9 /include
parentcc96fca4c5fa560b10dc7d6faf85cb7160aa475e (diff)
Fix Feature Issue ID 0000585.
Convergence of exif configuration between local site and remote site. Notes added on administration page where configuration is not OK. git-svn-id: http://piwigo.org/svn/trunk@1682 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/config_default.inc.php2
-rw-r--r--include/picture_metadata.inc.php7
2 files changed, 2 insertions, 7 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 453a9a02b..f477fc267 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -310,7 +310,7 @@ $conf['show_exif_fields'] = array(
// use_exif: Use EXIF data during database synchronization with files
// metadata
-$conf['use_exif'] = false;
+$conf['use_exif'] = true;
// use_exif_mapping: same behaviour as use_iptc_mapping
$conf['use_exif_mapping'] = array(
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php
index a661a09e9..0cc7dc2ea 100644
--- a/include/picture_metadata.inc.php
+++ b/include/picture_metadata.inc.php
@@ -32,13 +32,8 @@
include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
$template->assign_block_vars('metadata', array());
-if ($conf['show_exif'])
+if (($conf['show_exif']) and (function_exists('read_exif_data')))
{
- if (!function_exists('read_exif_data'))
- {
- die('Exif extension not available, admin should disable exif display');
- }
-
if ($exif = @read_exif_data($picture['current']['image_path']))
{
$exif = trigger_event('format_exif_data', $exif, $picture['current'] );