Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit a7065d2572c149890443d10a0b523f7c5b95df70 2 parents 1f919de + 68b1144
@mfairchild365 mfairchild365 authored
Showing with 4 additions and 0 deletions.
  1. +3 −0  src/UNL/MediaHub/Controller.php
  2. +1 −0  src/UNL/MediaHub/Router.php
View
3  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;
}
View
1  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):
Please sign in to comment.
Something went wrong with that request. Please try again.