From 6b0106a32446a125fd8a4ea7b9637c2378d52f72 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 22 Jul 2014 19:10:42 +0200
Subject: Fix some mime-type to extension mapping checks in Installer
 (#1489983)

---
 program/include/rcmail_install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'program/include/rcmail_install.php')

diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index eec21ec7e..9945f1d81 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -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);
       }
     }
-- 
cgit v1.2.3