diff options
author | flop25 <flop25@piwigo.org> | 2013-05-06 21:27:19 +0000 |
---|---|---|
committer | flop25 <flop25@piwigo.org> | 2013-05-06 21:27:19 +0000 |
commit | 6ee907f167614d21da5ca043283b551ec024c5ca (patch) | |
tree | 5b1a85b35dd5e237b4bed97adce1f227b2acab4e /include | |
parent | 214ac3bf65bbaf09d53c87d3386e48e4a77eab31 (diff) |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/functions_html.inc.php | 4 |
1 files 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 ? '...' : ''); } |