archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved 0000728: Add description triggers for categories and elements

Browse source 
Add:
  o render_category_description
  o render_category_literal_description
  o render_element_description

Merge branch-1_7 2048:2050 into BSF

git-svn-id: http://piwigo.org/svn/trunk@2079 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2007-08-25 23:10:12 +00:00
parent 7142203c4e
commit 5c13d6a8f1
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/category_cats.inc.php
View file

@ -217,6 +217,12 @@ if (count($categories) > 0)
{ {
update_cats_with_filtered_data($categories); 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); trigger_action('loc_begin_index_category_thumbnails', $categories);
if ($conf['subcatify']) if ($conf['subcatify'])
{ {
@ -224,7 +230,6 @@ if (count($categories) > 0)
foreach ($categories as $category) foreach ($categories as $category)
{ {
$comment = strip_tags(@$category['comment'], '<a><br><p><b><i><small><strong><font>');
if ($page['section']=='recent_cats') if ($page['section']=='recent_cats')
{ {
$name = get_cat_display_name_cache($category['uppercats'], null, false); $name = get_cat_display_name_cache($category['uppercats'], null, false);
@ -257,7 +262,10 @@ if (count($categories) > 0)
true, true,
'<br />' '<br />'
), ),
'DESCRIPTION' => @$comment, 'DESCRIPTION' =>
trigger_event('render_category_literal_description',
trigger_event('render_category_description',
@$category['comment'])),
'NAME' => $name, 'NAME' => $name,
) )
); );

3
index.php
View file

@ -296,7 +296,8 @@ if (isset($page['comment']) and $page['comment'] != '')
$template->assign_block_vars( $template->assign_block_vars(
'cat_infos.comment', 'cat_infos.comment',
array( array(
'COMMENTS' => $page['comment'] 'COMMENTS' =>
trigger_event('render_category_description', $page['comment'])
) )
); );
$header_infos['COMMENT'] = strip_tags($page['comment']); $header_infos['COMMENT'] = strip_tags($page['comment']);

7
picture.php
View file

@ -55,6 +55,9 @@ add_event_handler(
EVENT_HANDLER_PRIORITY_NEUTRAL, EVENT_HANDLER_PRIORITY_NEUTRAL,
2 2
); );
// add default event handler for rendering element description
add_event_handler('render_element_description', 'nl2br');
trigger_action('loc_begin_picture'); trigger_action('loc_begin_picture');
// this is the default handler that generates the display for the element // this is the default handler that generates the display for the element
@ -640,7 +643,9 @@ if (isset($picture['current']['comment'])
$template->assign_block_vars( $template->assign_block_vars(
'legend', 'legend',
array( 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']); $header_infos['COMMENT'] = strip_tags($picture['current']['comment']);
} }