Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-04 15:07:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove useless NewInstance

Browse source 
Bugfix: BodyStructure->SearchCharset return value
This commit is contained in:
djmaze 2020-05-08 11:49:18 +02:00
parent 82e560bc53
commit 693e0f4c10
61 changed files with 802 additions and 1345 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
View file

@ -92,7 +92,7 @@ class BodyStructure
*/
private $aSubParts;
private function __construct(string $sContentType, ?string $sCharset, array $aBodyParams, ?string $sContentID,
function __construct(string $sContentType, ?string $sCharset, array $aBodyParams, ?string $sContentID,
?string $sDescription, ?string $sMailEncodingName, ?string $sDisposition, ?array $aDispositionParams, string $sFileName,
?string $sLanguage, ?string $sLocation, int $iSize, int $iTextLineCount, string $sPartID, array $aSubParts)
{
@ -300,29 +300,26 @@ class BodyStructure
foreach ($mParts as $oPart)
{
$sResult = $oPart ? $oPart->Charset() : '';
if (!empty($sResult))
if ($sResult)
{
break;
}
}
if (0 === strlen($sResult))
if (!$sResult)
{
$aParts = $this->SearchAttachmentsParts();
foreach ($aParts as $oPart)
{
if (0 === \strlen($sResult))
{
$sResult = $oPart ? $oPart->Charset() : '';
}
else
$sResult = $oPart ? $oPart->Charset() : '';
if ($sResult)
{
break;
}
}
}
return $sResult;
return $sResult ?: '';
}
/**