From 6ee907f167614d21da5ca043283b551ec024c5ca Mon Sep 17 00:00:00 2001 From: flop25 Date: Mon, 6 May 2013 21:27:19 +0000 Subject: merge svn:22518 from trunk to 2.5 bug:2896 debugg the empty() adding htmlspecialchars(strip_tags()) before the truncature in order to avoid blanks, if the description has html/ExtendedDescription tags git-svn-id: http://piwigo.org/svn/branches/2.5@22519 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_html.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index f4eade57f..7581757bb 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -583,9 +583,9 @@ function get_thumbnail_title($info, $title, $comment) $title.= ' ('.implode(', ', $details).')'; } - if (!empty($comment)) + if (!empty($info['comment'])) { - $info['comment'] = trigger_event('render_element_description', $info['comment']); + $info['comment'] = htmlspecialchars(strip_tags(trigger_event('render_element_description', $info['comment']))); $title.= ' '.substr($info['comment'], 0, 100).(strlen($info['comment']) > 100 ? '...' : ''); } -- cgit v1.2.3