Changeset 7550 for trunk/include


Ignore:
Timestamp:
Nov 1, 2010, 8:30:59 PM (14 years ago)
Author:
plg
Message:

merge r7549 from branch 2.1 to trunk

bug 1986 fixed: add category description in pwg.categories.getList and
pwg.categories.getAdminList.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/ws_functions.inc.php

    r7495 r7550  
    406406  $query = '
    407407SELECT id, name, permalink, uppercats, global_rank,
     408    comment,
    408409    nb_images, count_images AS total_nb_images,
    409410    date_last, max_date_last, count_categories AS nb_categories
    … …  
    432433        'render_category_name',
    433434        $row['name'],
     435        'ws_categories_getList'
     436        )
     437      );
     438   
     439    $row['comment'] = strip_tags(
     440      trigger_event(
     441        'render_category_description',
     442        $row['comment'],
    434443        'ws_categories_getList'
    435444        )
    … …  
    483492    id,
    484493    name,
     494    comment,
    485495    uppercats,
    486496    global_rank
    … …  
    498508        'render_category_name',
    499509        $row['name'],
     510        'ws_categories_getAdminList'
     511        )
     512      );
     513    $row['comment'] = strip_tags(
     514      trigger_event(
     515        'render_category_description',
     516        $row['comment'],
    500517        'ws_categories_getAdminList'
    501518        )
Note: See TracChangeset for help on using the changeset viewer.