merge r12451 from trunk to branch 2.3
feature:2473 Apply trigger render_element_description for thumbnail title git-svn-id: http://piwigo.org/svn/branches/2.3@12452 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
bf0f2b6446
commit
0db23fdb18
2 changed files with 4 additions and 4 deletions
|
@ -109,11 +109,13 @@ foreach ($pictures as $row)
|
|||
$row['nb_comments'] = (int)@$nb_comments_of[$row['id']];
|
||||
}
|
||||
|
||||
$name = get_picture_title($row);
|
||||
|
||||
$tpl_var =
|
||||
array(
|
||||
'ID' => $row['id'],
|
||||
'TN_SRC' => get_thumbnail_url($row),
|
||||
'TN_ALT' => htmlspecialchars(strip_tags(get_picture_title($row))),
|
||||
'TN_ALT' => htmlspecialchars(strip_tags($name)),
|
||||
'TN_TITLE' => get_thumbnail_title($row),
|
||||
'URL' => $url,
|
||||
|
||||
|
@ -140,8 +142,6 @@ foreach ($pictures as $row)
|
|||
{
|
||||
$tpl_var['NB_HITS'] = $row['hit'];
|
||||
}
|
||||
|
||||
$name = trigger_event('render_element_description', get_picture_title($row));
|
||||
|
||||
switch ($page['section'])
|
||||
{
|
||||
|
|
|
@ -880,7 +880,7 @@ function get_picture_title($info)
|
|||
{
|
||||
if (isset($info['name']) and !empty($info['name']))
|
||||
{
|
||||
return $info['name'];
|
||||
return trigger_event('render_element_description', $info['name']);
|
||||
}
|
||||
|
||||
return get_name_from_file($info['file']);
|
||||
|
|
Loading…
Reference in a new issue