Changeset 2079

Timestamp:

Aug 26, 2007, 1:10:12 AM (17 years ago)

Author:

rub

Message:

Resolved 0000728: Add description triggers for categories and elements

Add:

o render_category_description
o render_category_literal_description
o render_element_description

Merge branch-1_7 2048:2050 into BSF

Location:

trunk

Files:

• include/category_cats.inc.php (modified) (3 diffs)
• index.php (modified) (1 diff)
• language (modified) (1 prop)
• picture.php (modified) (2 diffs)

trunk/include/category_cats.inc.php

@@ -218 +218 @@
     update_cats_with_filtered_data($categories);
   }
+
+  // add default event handler for rendering category literal description
+  add_event_handler('render_category_literal_description',
+    create_function('$d',
+      'return strip_tags($d, \'<a><br><p><b><i><small><strong><font>\');'));
+
   trigger_action('loc_begin_index_category_thumbnails', $categories);
   if ($conf['subcatify'])
@@ -225 +231 @@
     foreach ($categories as $category)
     {
-      $comment = strip_tags(@$category['comment'], '<a><br><p><b><i><small><strong><font>');
       if ($page['section']=='recent_cats')
       {
@@ -258 +263 @@
                                     '<br />'
                                   ),
-          'DESCRIPTION' => @$comment,
+          'DESCRIPTION' =>
+            trigger_event('render_category_literal_description', 
+              trigger_event('render_category_description', 
+                @$category['comment'])),
           'NAME'  => $name,
           )

trunk/index.php

@@ -297 +297 @@
     'cat_infos.comment',
     array(
-      'COMMENTS' => $page['comment']
+      'COMMENTS' =>
+        trigger_event('render_category_description', $page['comment'])
       )
     );

trunk/picture.php

@@ -56 +56 @@
   2
   );
+// add default event handler for rendering element description
+add_event_handler('render_element_description', 'nl2br');
+
 trigger_action('loc_begin_picture');
 
@@ -641 +644 @@
     'legend',
     array(
-      'COMMENT_IMG' => nl2br($picture['current']['comment'])
+      'COMMENT_IMG' =>
+        trigger_event('render_element_description',
+          $picture['current']['comment'])
       ));
   $header_infos['COMMENT'] = strip_tags($picture['current']['comment']);