ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1970 from jasonlfunk/master

Browse Source 
Allow developers to set the Content-Disposition header in Response::download()
This commit is contained in:
Taylor Otwell
2013-05-13 22:47:15 -07:00
parent 86fc0ca7cb 96e44d908c
commit 3965429176
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
laravel/response.php
View File

@@ -202,9 +202,14 @@ class Response {
// off to the HttpFoundation and let it create the header text. // off to the HttpFoundation and let it create the header text.
$response = new static(File::get($path), 200, $headers); $response = new static(File::get($path), 200, $headers);
// If the Content-Disposition header has already been set by the
// merge above, then do not override it with out generated one.
if (!isset($headers['Content-Disposition'])) {
$d = $response->disposition($name); $d = $response->disposition($name);
$response = $response->header('Content-Disposition', $d);
}
return $response->header('Content-Disposition', $d); return $response;
} }
/** /**