Correctly update cached message flags in ALL places when they are changed by the...

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index 07ba904a2e9811e9050d98af269c599ee1adaded..e2ea3f02e4bec4f6345560867b15390e4bc24e0a 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -5,7 +5,7 @@
  *
  * Used by attachment_common code.
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -54,8 +54,7 @@ $unsafe_url = set_url_var($unsafe_url, 'view_unsafe_images', 1);
 
 $body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
 $body = decodeBody($body, $encoding);
-$hookResults = do_hook('message_body', $body);
-$body = $hookResults[1];
+do_hook('message_body', $body);
 
 if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
     function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -66,17 +65,17 @@ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
 
 if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html')) {
     $ishtml = TRUE;
-    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
     // html attachment with character set information
     if (! empty($charset)) {
         $body = charset_decode($charset,$body,false,true);
     }
+    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
 } else {
     $ishtml = FALSE;
     translateText($body, $wrap_at, $charset);
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $oTemplate->assign('view_message_href', $msg_url);
 $oTemplate->assign('download_href', $dwnld_url);
@@ -86,4 +85,4 @@ $oTemplate->assign('body', $body);
 $oTemplate->display('view_text.tpl');
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>