Changeset 7a05909 in github

Timestamp:

Dec 11, 2009 4:39:43 PM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

317a7d9

Parents:

2717f9f

Message:

• fix warning on PHP5.3 (#1486284)

File:

• program/include/rcube_imap.php (modified) (2 diffs)

program/include/rcube_imap.php

@@ -1282 +1282 @@
       for ($i=0, $count=0; $i<count($part); $i++)
         if (is_array($part[$i]) && count($part[$i]) > 3)
-          // fetch message headers if message/rfc822 or named part (could contain Content-Location header)
-          if (strtolower($part[$i][0]) == 'message' ||
-            (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) || $part[$i][3]=='NIL'))) {
+          // fetch message headers if message/rfc822 or named part (could contain Content-Location header)
+          if (!is_array($part[$i][0]) && (strtolower($part[$i][0]) == 'message' ||
+            (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) || $part[$i][3]=='NIL')))) {
             $part_headers[] = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
             }
 
       // pre-fetch headers of all parts (in one command for better performance)
+      // @TODO: we could do this before _structure_part() call, to fetch
+      // headers for parts on all levels
       if ($part_headers)
         $part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox, $this->_msg_id, $part_headers);
@@ -1301 +1303 @@
       return $struct;
       }
-    
-    
+
+
     // regular part
     $struct->ctype_primary = strtolower($part[0]);