aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-10-15 15:29:31 +0000
committerpatdenice <patdenice@piwigo.org>2011-10-15 15:29:31 +0000
commit0db23fdb182b334003929fa45b41aecb5b24de7d (patch)
tree32271111f45bc6d76961938113096d6591bc70fe
parentbf0f2b64465dfea23e742c406a4c5993ca55f89d (diff)
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
-rw-r--r--include/category_default.inc.php6
-rw-r--r--include/functions.inc.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 256591db4..77d915ae8 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -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'])
{
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 5debca5d3..7873674ec 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -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']);