merge r4902 from branch 2.0 to trunk

bug 1423 fixed: support for ExtendedDescription (and all the ones using the
"render_category_name" event) in category names.


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

1 files changed, 15 insertions, 0 deletions

diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 37784a519..f94a386a0 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -427,6 +427,14 @@ SELECT id, name, permalink, uppercats, global_rank,
       $row[$key] = (int)$row[$key];
     }
 
+    $row['name'] = strip_tags(
+      trigger_event(
+        'render_category_name',
+        $row['name'],
+        'ws_categories_getList'
+        )
+      );
+    
     array_push($cats, $row);
   }
   usort($cats, 'global_rank_compare');
@@ -485,6 +493,13 @@ SELECT
   {
     $id = $row['id'];
     $row['nb_images'] = isset($nb_images_of[$id]) ? $nb_images_of[$id] : 0;
+    $row['name'] = strip_tags(
+      trigger_event(
+        'render_category_name',
+        $row['name'],
+        'ws_categories_getAdminList'
+        )
+      );
     array_push($cats, $row);
   }