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

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
 --------------------

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";
 }

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);