Merge from branch-1_7 (r2432).

Add triggers for category name (render_category_name).
Add  strip_tags for ALT attribute on category thumbnail.

git-svn-id: http://piwigo.org/svn/trunk@2433 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 20 insertions, 1 deletions

diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 6f9e1fc5a..2578fc8c3 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -246,6 +246,13 @@ function get_cat_display_name($cat_informations,
     is_array($cat) or trigger_error(
         'get_cat_display_name wrong type for category ', E_USER_WARNING
       );
+
+    $cat['name'] = trigger_event(
+      'render_category_name',
+      $cat['name'],
+      'get_cat_display_name'
+      );
+
     if ($is_first)
     {
       $is_first = false;
@@ -320,6 +327,12 @@ SELECT id, name, permalink
   {
     $cat = $cache['cat_names'][$category_id];
 
+    $cat['name'] = trigger_event(
+      'render_category_name',
+      $cat['name'],
+      'get_cat_display_name_cache'
+      );
+
     if ($is_first)
     {
       $is_first = false;
@@ -430,7 +443,13 @@ function get_html_menu_category($categories, $selected_category)
     {
       $menu.= ' rel="up"';
     }
-    $menu.= ' title="'.$title.'">'.$category['name'].'</a>';
+    $menu.= ' title="'.$title.'">';
+    $menu.= trigger_event(
+      'render_category_name',
+      $category['name'],
+      'get_html_menu_category'
+      );
+    $menu.= '</a>';
 
     if ( $category['count_images']>0 )
     {// at least one direct or indirect image