diff options
| -rw-r--r-- | inc/media.php | 4 | ||||
| -rw-r--r-- | lib/tpl/default/detail.php | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/inc/media.php b/inc/media.php index a65b94e26..aa29c0d7d 100644 --- a/inc/media.php +++ b/inc/media.php @@ -540,12 +540,12 @@ function media_printimgdetail($item){ echo '</div>'; // read EXIF/IPTC data - $t = $item['meta']->getField('IPTC.Headline'); + $t = $item['meta']->getField(array('IPTC.Headline','xmp.dc:title')); $d = $item['meta']->getField(array('IPTC.Caption','EXIF.UserComment', 'EXIF.TIFFImageDescription', 'EXIF.TIFFUserComment')); if(utf8_strlen($d) > 250) $d = utf8_substr($d,0,250).'...'; - $k = $item['meta']->getField(array('IPTC.Keywords','IPTC.Category')); + $k = $item['meta']->getField(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); // print EXIF/IPTC data if($t || $d || $k ){ diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php index d0e07ce1a..0e8ddc743 100644 --- a/lib/tpl/default/detail.php +++ b/lib/tpl/default/detail.php @@ -45,10 +45,7 @@ if (!defined('DOKU_INC')) die(); <div class="img_detail"> <p class="img_caption"> - <?php print nl2br(hsc(tpl_img_getTag(array('IPTC.Caption', - 'EXIF.UserComment', - 'EXIF.TIFFImageDescription', - 'EXIF.TIFFUserComment')))); ?> + <?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?> </p> <p>← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p> @@ -76,7 +73,7 @@ if (!defined('DOKU_INC')) die(); $t = tpl_img_getTag('Simple.Camera'); if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>'; - $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category')); + $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); if($t) print '<dt>'.$lang['img_keywords'].':</dt><dd>'.hsc($t).'</dd>'; ?> |