Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2012-09-11 14:05:54 -04:00 · 2012-09-11 14:05:54 -04:00 · 751ed8276d
commit 751ed8276d
parent 1afdcb8c2d c61f5d1972
1 changed files with 3 additions and 1 deletions
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@ -410,7 +410,9 @@ class Application_Model_StoredFile
            return "mp3";
        } elseif ($mime == "audio/x-flac") {
            return "flac";
-        } else {
+        } elseif ($mime == "audio/mp4") {
+            return "mp4";
+        } else {    
            throw new Exception("Unknown $mime");
        }
    }