aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-02-06 13:04:45 +0000
committerplegall <plg@piwigo.org>2014-02-06 13:04:45 +0000
commit4567be63dc069f99eff5ff16447ef2ed2838d6b1 (patch)
tree95ff71bce41394345b91b7c3db13f91cd4b9ce2d
parent42ffeed1c35c7a39b48c2b20e28cd026c77a6ed1 (diff)
merge r27239 from branch 2.6 to trunk
bug 3042 fixed: apply render_element_description on photo label in history search results git-svn-id: http://piwigo.org/svn/trunk@27240 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/history.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/history.php b/admin/history.php
index 8a2e07926..5c1aa4326 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -319,7 +319,7 @@ SELECT
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
- $label_of_image[ $row['id'] ] = $row['label'];
+ $label_of_image[ $row['id'] ] = trigger_event('render_element_description', $row['label']);
if (isset($row['filesize']))
{