Missing variable check added to prevent content-type parsing error #356

Webklex/laravel-imap#356
Webklex · Oct 16, 2020 · c8051a5 · c8051a5
1 parent 0e5e6f2
commit c8051a5
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Part.php b/src/Part.php
@@ -166,7 +166,6 @@ protected function parse(){
             $body = $this->raw;
         }
 
-        $this->subtype = $this->parseSubtype($this->header->get("content-type"));
         $this->parseDisposition();
         $this->parseDescription();
         $this->parseEncoding();
@@ -186,10 +185,15 @@ protected function parse(){
             ]);
         }
 
-        if(!empty($this->header->get("content-type"))){
-            $rawContentType = $this->header->get("content-type");
-            $contentTypeArray = explode(';', $rawContentType);
-            $this->content_type = trim($contentTypeArray[0]);
+        $content_types = $this->header->get("content-type");
+        if(!empty($content_types)){
+            $this->subtype = $this->parseSubtype($content_types);
+            $content_type = $content_types;
+            if (is_array($content_types)) {
+                $content_type = $content_types[0];
+            }
+            $parts = explode(';', $content_type);
+            $this->content_type = trim($parts[0]);
         }