aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2007-11-29 13:08:38 +0000
committerpatdenice <patdenice@piwigo.org>2007-11-29 13:08:38 +0000
commit58fafb94d8aeae3c29b2c4d1a4614c21ab6cacdf (patch)
treea81337b9fc870c0f2c477c11b30d023b7abf33b9
parenta6026ae08929733515af628a784942c715c1eb15 (diff)
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
-rw-r--r--include/category_cats.inc.php3
-rw-r--r--include/page_header.php5
-rw-r--r--include/section_init.inc.php3
3 files changed, 7 insertions, 4 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index ff131c007..2b3cde0d7 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -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,
)
);
diff --git a/include/page_header.php b/include/page_header.php
index 99890b182..cd51f5031 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -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']) ?
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 99dad6182..240beb804 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -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),