Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 14:24:52 -05:00
commit 65a2fe567e

View file

@ -113,11 +113,12 @@
if (Config::get('app.sendfile')) { if (Config::get('app.sendfile')) {
$response->header('X-Sendfile', $track->getFileFor('MP3')); $response->header('X-Sendfile', $track->getFileFor('MP3'));
$response->header('Content-Disposition', 'attachment; filename="' . $track->getDownloadFilenameFor($formatName) . '"');
} else { } else {
$response->header('X-Accel-Redirect', $track->getFileFor('MP3')); $response->header('X-Accel-Redirect', $track->getFileFor('MP3'));
$response->header('Content-Disposition', 'attachment; filename=' . $track->getDownloadFilenameFor($formatName));
} }
$response->header('Content-Disposition', 'attachment; filename="' . $track->getDownloadFilenameFor($formatName) . '"');
$response->header('Content-Type', $format['mime_type']); $response->header('Content-Type', $format['mime_type']);
return $response; return $response;