mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
removing unneeded lines from RequestHandler,
adding error surpression oeprator in front of header() to make the components group pass (RequestHandler class) git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6846 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
db35048e12
commit
11ba82430a
1 changed files with 1 additions and 5 deletions
|
@ -625,7 +625,6 @@ class RequestHandlerComponent extends Object {
|
|||
|
||||
if ($cType != null) {
|
||||
$header = 'Content-type: ' . $cType;
|
||||
$headers = array();
|
||||
|
||||
if (!empty($options['charset'])) {
|
||||
$header .= '; charset=' . $options['charset'];
|
||||
|
@ -634,10 +633,7 @@ class RequestHandlerComponent extends Object {
|
|||
header('Content-Disposition: attachment; filename="' . $options['attachment'] . '"');
|
||||
}
|
||||
if (Configure::read() < 2 && !defined('CAKEPHP_SHELL')) {
|
||||
header($header);
|
||||
foreach ($headers as $h) {
|
||||
header($h);
|
||||
}
|
||||
@header($header);
|
||||
}
|
||||
$this->__responseTypeSet = $cType;
|
||||
return true;
|
||||
|
|
Loading…
Reference in a new issue