Fix incorrect use of rcube_utils::explode()

roundcube · Jan 28, 2024 · c47accb · c47accb
1 parent 9e5c019
commit c47accb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -725,11 +725,6 @@ parameters:
 			count: 1
 			path: program/lib/Roundcube/rcube_ldap.php
 
-		-
-			message: "#^Static method rcube_utils\\:\\:explode\\(\\) invoked with 3 parameters, 2 required\\.$#"
-			count: 1
-			path: program/lib/Roundcube/rcube_message.php
-
 		-
 			message: "#^Variable \\$charsets might not be defined\\.$#"
 			count: 1

diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
@@ -599,8 +599,12 @@ private function parse_structure($structure, $recursive = false)
 
             // parse headers from message/rfc822 part
             if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) {
-                $part_body = $this->get_part_body($structure->mime_id, false, 32768);
-                [$headers] = rcube_utils::explode("\r\n\r\n", $part_body, 2);
+                $part_body = $headers = $this->get_part_body($structure->mime_id, false, 32768);
+
+                if (($pos = strpos($headers, "\r\n\r\n")) !== false) {
+                    $headers = substr($headers, $pos);
+                }
+
                 $structure->headers = rcube_mime::parse_headers($headers);
 
                 if ($this->context === $structure->mime_id) {