Changeset 2812

Timestamp:

11/14/08 17:52:14 (8 weeks ago)

Author:

chrismeller

Message:

Adding _after hooks after template_header and admin_header are executed.

This effectively reverts r2811 and re-implements it in a better way.

Location:

trunk/htdocs/system

Files:

• admin/header.php (modified) (2 diffs)
• classes/theme.php (modified) (2 diffs)

trunk/htdocs/system/admin/header.php

@@ -18 +18 @@
     </script>
     <?php
+        Plugins::act( 'admin_header', $this );
         Stack::out( 'admin_header_javascript', '<script src="%s" type="text/javascript"></script>'."\r\n" );
         Stack::out( 'admin_stylesheet', '<link rel="stylesheet" type="text/css" href="%s" media="%s">'."\r\n" );
@@ -26 +27 @@
 
     <?php
-        Plugins::act( 'admin_header', $this );
+        Plugins::act( 'admin_header_after', $this );
     ?>
 

trunk/htdocs/system/classes/theme.php

@@ -471 +471 @@
 
         $paramarray['user_filters']= $user_filters;
-        
+
         $this->assign( 'criteria', htmlentities( Controller::get_var('criteria'), ENT_QUOTES, 'UTF-8' ) );
         return $this->act_display( $paramarray );
@@ -559 +559 @@
         $output = Stack::get( 'template_stylesheet', '<link rel="stylesheet" type="text/css" href="%s" media="%s">'."\r\n" );
         $output.= Stack::get( 'template_header_javascript', '<script src="%s" type="text/javascript"></script>'."\r\n" );
+        Plugins::act( 'template_header_after', $theme );
         return $output;
     }