From 58fafb94d8aeae3c29b2c4d1a4614c21ab6cacdf Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Thu, 29 Nov 2007 13:08:38 +0000
Subject: [PATCH] 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
---
 include/category_cats.inc.php | 3 ++-
 include/page_header.php       | 5 +++--
 include/section_init.inc.php  | 3 ++-
 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),