diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-10-23 17:09:06 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-10-23 17:09:06 +0000 |
| commit | 2281f1d6dc2e6c013a5c1065e9a6ef9734aa8088 (patch) | |
| tree | f94d6c6eea8200f9682fad7ec6817b1f6021c514 /modules_v3/lightbox/functions | |
| parent | f1d918511baf92e34b414b1e090fd9a2c1523add (diff) | |
| download | webtrees-2281f1d6dc2e6c013a5c1065e9a6ef9734aa8088.tar.gz webtrees-2281f1d6dc2e6c013a5c1065e9a6ef9734aa8088.tar.bz2 webtrees-2281f1d6dc2e6c013a5c1065e9a6ef9734aa8088.zip | |
#815330 - Album Tab - Page language title not printed
Diffstat (limited to 'modules_v3/lightbox/functions')
| -rw-r--r-- | modules_v3/lightbox/functions/lightbox_print_media_row.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules_v3/lightbox/functions/lightbox_print_media_row.php b/modules_v3/lightbox/functions/lightbox_print_media_row.php index 8cbcb9238a..fbe5701f55 100644 --- a/modules_v3/lightbox/functions/lightbox_print_media_row.php +++ b/modules_v3/lightbox/functions/lightbox_print_media_row.php @@ -121,10 +121,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { // Get the title of the media $media=WT_Media::getInstance($rowm['m_media']); - $rawTitle = $rowm['m_titl']; - if (empty($rawTitle)) $rawTitle = get_gedcom_value('TITL', 2, $rowm['mm_gedrec']); - if (empty($rawTitle)) $rawTitle = basename($rowm['m_file']); - $mediaTitle = PrintReady(htmlspecialchars($rawTitle)); + $mediaTitle = $media->getFullName(); $mainMedia = check_media_depth($rowm['m_file'], 'NOTRUNC'); $mainFileExists = true; @@ -187,20 +184,23 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { } $menu = new WT_Menu(); // Truncate media title to 13 chars (45 chars if Streetview) and add ellipsis - $mtitle = $rawTitle; + $mtitle = $mediaTitle; if (strpos($rowm['m_file'], 'http://maps.google.')===0) { - if (utf8_strlen($rawTitle)>16) $mtitle = utf8_substr($rawTitle, 0, 45).WT_I18N::translate('…'); + if (utf8_strlen($mtitle)>16) { + $mtitle = utf8_substr($rowm['m_file'], 0, 45).WT_I18N::translate('…'); + } } else { - if (utf8_strlen($rawTitle)>16) $mtitle = utf8_substr($rawTitle, 0, 13).WT_I18N::translate('…'); + if (utf8_strlen($mtitle)>16) { + $mtitle = utf8_substr($mtitle, 0, 13).WT_I18N::translate('…'); + } } - $mtitle = PrintReady(htmlspecialchars($mtitle)); // Continue menu construction // If media file is missing from 'media' directory, but is referenced in Gedcom if (!media_exists($rowm['m_file']) && !media_exists($mainMedia)) { $menu->addLabel("<img src=\"{$thumbnail}\" style=\"display:none;\" alt=\"\" title=\"\" />" . WT_I18N::translate('Edit')." (". $rowm['m_media'].")", 'right'); } else { - $menu->addLabel("<img src=\"{$thumbnail}\" style=\"display:none;\" alt=\"\" title=\"\" />" . PrintReady($mtitle), 'right'); + $menu->addLabel("<img src=\"{$thumbnail}\" style=\"display:none;\" alt=\"\" title=\"\" />" . $mtitle, 'right'); } // Next line removed to avoid gallery thumbnail duplication // $menu['link'] = mediaInfo['url']; |