Moved the generic_header hook back to page_header.php. bug #554278

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3082 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index b42a84659e9056dab4a09876096c23f8fa86d418..dedd4e0ab0d33f77ff78b9700f129f9bde210c6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@ Version 1.3.0-DEVEL -- CVS
   - Right to left languages implementation initiated
   - Enable people with file_uploads = off to still send mail. Patch from Seth
     E. Randall.
-
+  - Moved the generic_header hook back to page_header.php. bug #554278
   
 Version 1.2.7 -- CVS
 --------------------

diff --git a/functions/page_header.php b/functions/page_header.php
index c4d8f3af2e0a0a3fc5d59ad304e3e48fde18fd39..9d868311b7212436f4ae4a3965dc4b816a700c18 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -31,6 +31,10 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
         echo '<LINK REL="stylesheet" TYPE="text/css" HREF="' .
              $base_uri . 'themes/css/'.$custom_css.'">';
     }
+
+    if ($do_hook) {
+        do_hook ("generic_header");
+    }
     
     echo "\n<title>$title</title>$xtra</head>\n\n";
 }

diff --git a/src/right_main.php b/src/right_main.php
index aee1acd1556b50bf7cb1d678c221ebeaedc29c1a..31f2ac143eab61cd80fa5afc1cfec0f8b5dd189d 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -102,9 +102,9 @@ else {
 } 
 
 global $color;
-if( isset($do_hook) && $do_hook ) {
+/* if( isset($do_hook) && $do_hook ) {
     do_hook ("generic_header");
-}
+}*/
 
 sqimap_mailbox_select($imapConnection, $mailbox);