Download empty eml file name fix.

This commit is contained in:
RainLoop Team 2013-12-12 13:04:53 +04:00
parent 0d4362074a
commit a69d3150ea

View file

@ -5594,7 +5594,7 @@ class Actions
$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array( $mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array(
'Folder' => $mResponse->Folder(), 'Folder' => $mResponse->Folder(),
'Uid' => (string) $mResponse->Uid(), 'Uid' => (string) $mResponse->Uid(),
'Subject' => \MailSo\Base\Utils::Utf8Clear($mResponse->Subject()), 'Subject' => \trim(\MailSo\Base\Utils::Utf8Clear($mResponse->Subject())),
'MessageId' => $mResponse->MessageId(), 'MessageId' => $mResponse->MessageId(),
'Size' => $mResponse->Size(), 'Size' => $mResponse->Size(),
'DateTimeStampInUTC' => !!$this->Config()->Get('labs', 'date_from_headers', false) 'DateTimeStampInUTC' => !!$this->Config()->Get('labs', 'date_from_headers', false)
@ -5637,13 +5637,14 @@ class Actions
} }
} }
$sSubject = $mResult['Subject'];
$mResult['RequestHash'] = \RainLoop\Utils::EncodeKeyValues(array( $mResult['RequestHash'] = \RainLoop\Utils::EncodeKeyValues(array(
'V' => APP_VERSION, 'V' => APP_VERSION,
'Account' => $oAccount ? md5($oAccount->Hash()) : '', 'Account' => $oAccount ? md5($oAccount->Hash()) : '',
'Folder' => $mResult['Folder'], 'Folder' => $mResult['Folder'],
'Uid' => $mResult['Uid'], 'Uid' => $mResult['Uid'],
'MimeType' => 'message/rfc822', 'MimeType' => 'message/rfc822',
'FileName' => $mResult['Subject'].'.eml' 'FileName' => (0 === \strlen($sSubject) ? 'message-'.$mResult['Uid'] : $sSubject).'.eml'
)); ));
// Flags // Flags