Skip to content

Commit 08b8adb

Browse files
committed
cancelled reformated code
1 parent a8d29f5 commit 08b8adb

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/Fetch/Message.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,17 @@ protected function processStructure($structure, $partIdentifier = null)
524524
$mb_converted = false;
525525
if (function_exists('mb_convert_encoding')) {
526526
$encodings = mb_list_encodings();
527-
if ($key = array_search(
528-
strtolower($parameters['charset']),
529-
array_map(function($val){return mb_strtolower($val);}, $encodings)
530-
) !== false) {
531-
$parameters['charset'] = $encodings[$key];
532-
}else {
533-
$parameters['charset'] = ($structure->encoding === 0 ? 'US-ASCII' : 'UTF-8');
527+
if (!in_array($parameters['charset'], $encodings)) {
528+
$encodingIndex = array_search($parameters['charset'], array_map('mb_strtolower', $encodings));
529+
if (false !== $encodingIndex) {
530+
$parameters['charset'] = $encodings[$encodingIndex];
531+
} else {
532+
if ($structure->encoding === 0) {
533+
$parameters['charset'] = 'US-ASCII';
534+
} else {
535+
$parameters['charset'] = 'UTF-8';
536+
}
537+
}
534538
}
535539

536540
$messageBody = @mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);

0 commit comments

Comments
 (0)