From 4c95c8e6b5b9514e53b095cfe27cd6cad539c7d2 Mon Sep 17 00:00:00 2001 From: flop25 Date: Mon, 13 May 2013 16:21:41 +0000 Subject: merge svn:22520 from trunk to 2.5 bug:2896 thumbnail title fix (use $comment parameter + no double htmlspecialchars) git-svn-id: http://piwigo.org/svn/branches/2.5@22634 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_html.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 7581757bb..2daac2c83 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -583,10 +583,10 @@ function get_thumbnail_title($info, $title, $comment) $title.= ' ('.implode(', ', $details).')'; } - if (!empty($info['comment'])) + if (!empty($comment)) { - $info['comment'] = htmlspecialchars(strip_tags(trigger_event('render_element_description', $info['comment']))); - $title.= ' '.substr($info['comment'], 0, 100).(strlen($info['comment']) > 100 ? '...' : ''); + $comment = strip_tags($comment); + $title.= ' '.substr($comment, 0, 100).(strlen($comment) > 100 ? '...' : ''); } $title = htmlspecialchars(strip_tags($title)); -- cgit v1.2.3