* $data didn't have the $

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index b700aceb7da4ff11e2f1362a05a00b1e23b061c7..3b684a9edb8dd4c185d48c0f07ca6f82ae1a01c8 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -14,9 +14,7 @@
    global $debug_mime;
    $debug_mime = false;
    
-   include "../functions/i18n.php";
    include "../functions/imap.php";
-   include "../config/config.php";
 
    /** Setting up the objects that have the structure for the message **/
 
@@ -384,7 +382,7 @@
       fputs ($imap_stream, "a010 FETCH $id BODY[$ent_id]\r\n");
       $data = sqimap_read_data ($imap_stream, 'a010', true, $response, $message);
       $topline = array_shift($data);
-      while (! ereg('\\* [0-9]+ FETCH ', $topline) && data)
+      while (! ereg('\\* [0-9]+ FETCH ', $topline) && $data)
           $topline = array_shift($data);
       $wholemessage = implode('', $data);
 
@@ -484,7 +482,7 @@
       global $show_html_default;
       
       if (! $message)
-       return;
+       return 0;
 
       // Show text/plain or text/html -- the first one we find.
       if ($message->header->type0 == 'text' &&