From e246771af0bc9f10b38cf38d9fa4c8fd4e600830 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 7 Jul 2015 15:09:06 -0400
Subject: [PATCH] SAAS-922 - additional mime-type coverage

---
 airtime_mvc/application/common/FileDataHelper.php | 4 ++++
 airtime_mvc/application/models/StoredFile.php     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/common/FileDataHelper.php b/airtime_mvc/application/common/FileDataHelper.php
index 0d2c243c0..316d6359f 100644
--- a/airtime_mvc/application/common/FileDataHelper.php
+++ b/airtime_mvc/application/common/FileDataHelper.php
@@ -40,6 +40,10 @@ class FileDataHelper {
             return ".ogg";
         } elseif ($mime == "audio/mp3" || $mime == "audio/mpeg" || $mime == "audio/mpeg3") {
             return ".mp3";
+        } elseif ($mime == "audio/mp2") {
+            return ".mp2";
+        } elseif ($mime == "audio/mp1") {
+            return ".mp1";
         } elseif ($mime == "audio/x-flac") {
             return ".flac";
         } elseif ($mime == "audio/mp4") {
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index ebc2ab2b0..e975ccd8c 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -527,7 +527,7 @@ SQL;
      */
     public function getRelativeFileUrl($baseUrl)
     {
-        return $baseUrl."api/get-media/file/".$this->getId().FileDataHelper::getFileExtensionFromMime($this->_file->getDbMime());
+        return $baseUrl."api/get-media/file/".$this->getId();
     }
     
     public function getResourceId()