oops: Fix crash processing emails with attachments

include/class.mailfetch.php

@@ -757,7 +757,8 @@ class MailFetcher {
 
                 // Validate and save immediately
                 try {
-                    $file['id'] = $fileField->uploadAttachment($file);
+                    if ($f = $fileField->uploadAttachment($file))
+                        $file['id'] = $f->getId();
                 }
                 catch (FileUploadError $ex) {
                     $file['error'] = $file['name'] . ': ' . $ex->getMessage();

include/class.thread.php

@@ -971,6 +971,7 @@ implements TemplateVariable {
     }
 
     function createAttachments(array $files) {
+        $attachments = array();
         foreach ($files as $info) {
            if ($A = $this->createAttachment($info, @$info['name'] ?: false))
                $attachments[] = $A;