Merge from branch-1_7: 2174

Add second parameter for render_category_description to differentiate both triggers in category_cats.inc.php and section_init.inc.php.
Add render_page_banner trigger.

git-svn-id: http://piwigo.org/svn/trunk@2175 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2007-11-29 13:08:38 +00:00
parent a6026ae089
commit 58fafb94d8
3 changed files with 7 additions and 4 deletions
+2 -1
View File
@@ -257,7 +257,8 @@ if (count($categories) > 0)
'DESCRIPTION' =>
trigger_event('render_category_literal_description',
trigger_event('render_category_description',
@$category['comment'])),
@$category['comment'],
'subcatify_category_description')),
'NAME' => $name,
)
);
+3 -2
View File
@@ -39,8 +39,9 @@ $template->assign_vars(
$page['gallery_title'] : $conf['gallery_title'],
'PAGE_BANNER' =>
isset($page['page_banner']) ?
$page['page_banner'] : $conf['page_banner'],
trigger_event('render_page_banner',
isset($page['page_banner']) ?
$page['page_banner'] : $conf['page_banner']),
'BODY_ID' =>
isset($page['body_id']) ?
+2 -1
View File
@@ -206,7 +206,8 @@ if ('categories' == $page['section'])
'comment' =>
trigger_event(
'render_category_description',
$page['category']['comment']
$page['category']['comment'],
'main_page_category_description'
),
'title' =>
get_cat_display_name($page['category']['upper_names'], '', false),