Fix some mime-type to extension mapping checks in Installer (#1489983)

pull/208/head
Aleksander Machniak 10 years ago
parent be6a095f83
commit 6b0106a324

@ -37,6 +37,7 @@ CHANGELOG Roundcube Webmail
- Improve text messages display and conversion to HTML (#1488937)
- Don't remove links when html signature is converted to text (#1489621)
- Fix mbox files import
- Fix some mime-type to extension mapping checks in Installer (#1489983)
RELEASE 1.0.2
-------------

@ -210,7 +210,6 @@ if ($db_working) {
<h3>Test filetype detection</h3>
<p>
<?php
if ($errors = $RCI->check_mime_detection()) {
@ -225,12 +224,9 @@ if ($errors = $RCI->check_mime_detection()) {
}
else {
$RCI->pass('Fileinfo/mime_content_type configuration');
echo "<br/>";
}
?>
</p>
<p>
<?php
if ($errors = $RCI->check_mime_extensions()) {
$RCI->fail('Mimetype to file extension mapping');
@ -239,6 +235,7 @@ if ($errors = $RCI->check_mime_extensions()) {
}
else {
$RCI->pass('Mimetype to file extension mapping');
echo "<br/>";
}
?>

@ -476,7 +476,7 @@ class rcmail_install
$types = array(
'application/zip' => 'zip',
'application/x-tar' => 'tar',
'application/java-archive' => 'jar',
'application/pdf' => 'pdf',
'image/gif' => 'gif',
'image/svg+xml' => 'svg',
);
@ -484,7 +484,7 @@ class rcmail_install
$errors = array();
foreach ($types as $mimetype => $expected) {
$ext = rcube_mime::get_mime_extensions($mimetype);
if ($ext[0] != $expected) {
if (!in_array($expected, (array) $ext)) {
$errors[] = array($mimetype, $ext, $expected);
}
}

Loading…
Cancel
Save