From 9cf50d16d40a829a09d8275cb6895c2dcd9b959d 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)

Conflicts:

	CHANGELOG
---
 installer/rcube_install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'installer/rcube_install.php')

diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index ef7000688..85688d171 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -490,7 +490,7 @@ class rcube_install
     $types = array(
       'application/zip'   => 'zip',
       'application/x-tar' => 'tar',
-      'application/java-archive' => 'jar',
+      'application/pdf'   => 'pdf',
       'image/gif'     => 'gif',
       'image/svg+xml' => 'svg',
     );
@@ -498,7 +498,7 @@ class rcube_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