From e6bfa5b970a166e7630b33a0c0c326b19025f666 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 20 Jun 2015 10:28:16 +1000
Subject: [PATCH] Add extra file types - Refs #1209

---
 .htaccess                                | 5 ++++-
 modules/cms/classes/MediaLibraryItem.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index 8a5864b75..cfae3fa39 100644
--- a/.htaccess
+++ b/.htaccess
@@ -50,14 +50,17 @@
     RewriteCond %{REQUEST_URI} !\.woff
     RewriteCond %{REQUEST_URI} !\.woff2
     RewriteCond %{REQUEST_URI} !\.ttf
+    RewriteCond %{REQUEST_URI} !\.flv
     RewriteCond %{REQUEST_URI} !\.wmv
     RewriteCond %{REQUEST_URI} !\.mp3
+    RewriteCond %{REQUEST_URI} !\.ogg
     RewriteCond %{REQUEST_URI} !\.wav
     RewriteCond %{REQUEST_URI} !\.avi
     RewriteCond %{REQUEST_URI} !\.mov
     RewriteCond %{REQUEST_URI} !\.mp4
+    RewriteCond %{REQUEST_URI} !\.mpeg
     RewriteCond %{REQUEST_URI} !\.webm
-    RewriteCond %{REQUEST_URI} !\.ogg
+    RewriteCond %{REQUEST_URI} !\.mkv
     RewriteCond %{REQUEST_URI} !docs/.*
     RewriteCond %{REQUEST_URI} !themes/.*
     RewriteRule ^ index.php [L,NC]
diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index 183a834df..fccab364e 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -55,8 +55,8 @@ class MediaLibraryItem
      */
     protected static $defaultTypeExtensions = [
         'image' => ['gif', 'png', 'jpg', 'jpeg', 'bmp'],
-        'video' => ['mp4', 'avi', 'mov', 'mpg'],
-        'audio' => ['mp3', 'wav', 'wma', 'm4a']
+        'video' => ['mp4', 'avi', 'mov', 'mpg', 'mpeg', 'mkv', 'webm'],
+        'audio' => ['mp3', 'wav', 'wma', 'm4a', 'ogg']
     ];
 
     protected static $imageExtensions;