Skip to content

Allow developers to set the Content-Disposition header in Response::download() #1970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2013
Merged

Allow developers to set the Content-Disposition header in Response::download() #1970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions laravel/response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,14 @@ public static function download($path, $name = null, $headers = array())
// off to the HttpFoundation and let it create the header text.
$response = new static(File::get($path), 200, $headers);

$d = $response->disposition($name);
// 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);
$response = $response->header('Content-Disposition', $d);
}

return $response->header('Content-Disposition', $d);
return $response;
}

/**
Expand Down