Merge branch 'master' of github.com:unl/UNL_MediaHub

unl · Jan 25, 2012 · a7065d2 · a7065d2
2 parents 1f919de + 68b1144
commit a7065d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/UNL/MediaHub/Controller.php b/src/UNL/MediaHub/Controller.php
@@ -229,6 +229,9 @@ function preRun($cached)
         case 'json':
             header('Content-type: application/json');
             break;
+        case 'vtt':
+            header('Content-type: text/vtt');
+            break;
         default:
             break;
         }

diff --git a/src/UNL/MediaHub/Router.php b/src/UNL/MediaHub/Router.php
@@ -32,6 +32,7 @@ public static function getRoute($requestURI)
                 break;
             case preg_match('/^media\/([0-9]+)\/vtt$/', $requestURI, $matches):
                 $options['view'] = 'media_vtt';
+                $options['format'] = 'vtt';
                 $options['id']   = $matches[1];
                 break;
             case preg_match('/^media\/([0-9]+)\/image(\.[\w]+)?$/', $requestURI, $matches):