From 3eb3e323b1ac6da4258c694114e7fa852cff1315 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 1 Nov 2010 19:30:59 +0000 Subject: merge r7549 from branch 2.1 to trunk bug 1986 fixed: add category description in pwg.categories.getList and pwg.categories.getAdminList. git-svn-id: http://piwigo.org/svn/trunk@7550 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/ws_functions.inc.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 3cc0fc3a3..a86c54a81 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -405,6 +405,7 @@ function ws_categories_getList($params, &$service) $query = ' SELECT id, name, permalink, uppercats, global_rank, + comment, nb_images, count_images AS total_nb_images, date_last, max_date_last, count_categories AS nb_categories FROM '.CATEGORIES_TABLE.' @@ -435,6 +436,14 @@ SELECT id, name, permalink, uppercats, global_rank, ) ); + $row['comment'] = strip_tags( + trigger_event( + 'render_category_description', + $row['comment'], + 'ws_categories_getList' + ) + ); + array_push($cats, $row); } usort($cats, 'global_rank_compare'); @@ -482,6 +491,7 @@ SELECT SELECT id, name, + comment, uppercats, global_rank FROM '.CATEGORIES_TABLE.' @@ -500,6 +510,13 @@ SELECT 'ws_categories_getAdminList' ) ); + $row['comment'] = strip_tags( + trigger_event( + 'render_category_description', + $row['comment'], + 'ws_categories_getAdminList' + ) + ); array_push($cats, $row); } -- cgit v1.2.3