archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge svn:22518 from trunk to 2.5

Browse source 
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
This commit is contained in:
flop25 2013-05-06 21:27:19 +00:00
parent 214ac3bf65
commit 6ee907f167
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/functions_html.inc.php
View file

@ -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 ? '...' : '');
}