tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Reverted r75263 and r75264

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75267 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-04-27 06:53:26 +00:00 committed by Sam Minnee
parent ec5b9ecf06
commit 18e0bcf777
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/HTTP.php
View File

@ -136,7 +136,7 @@ class HTTP {
*/
static function sendFileToBrowser($fileData, $fileName, $mimeType = false) {
user_error("HTTP::sendFileToBrowser() deprecated; return a HTTPRequest::send_file() object instead", E_USER_NOTICE);
echo HTTPRequest::send_file($fileData, $fileName, $mimeType);
HTTPRequest::send_file($fileData, $fileName, $mimeType)->output();
exit(0);
}

2
core/control/HTTPRequest.php
View File

@ -265,7 +265,7 @@ class HTTPRequest extends Object implements ArrayAccess {
$response->addHeader("Content-Length", strlen($fileData));
$response->addHeader("Pragma", ""); // Necessary because IE has issues sending files over SSL
return $response->output();
return $response;
}
/**