mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
[ticket/14285] Move exit inside callback so the controller can return a response
PHPBB3-14285
This commit is contained in:
parent
5c2a8bbfdf
commit
26b7180874
1 changed files with 5 additions and 5 deletions
|
@ -85,11 +85,7 @@ class controller
|
||||||
throw new http_exception(500, 'Headers already sent');
|
throw new http_exception(500, 'Headers already sent');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->response->send();
|
return $this->response;
|
||||||
|
|
||||||
// Terminate script to avoid the execution of terminate events
|
|
||||||
// This avoid possible errors with db connection closed
|
|
||||||
exit;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -167,6 +163,10 @@ class controller
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
fclose($output);
|
fclose($output);
|
||||||
flush();
|
flush();
|
||||||
|
|
||||||
|
// Terminate script to avoid the execution of terminate events
|
||||||
|
// This avoid possible errors with db connection closed
|
||||||
|
exit;
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->response->isNotModified($this->symfony_request);
|
$this->response->isNotModified($this->symfony_request);
|
||||||
|
|
Loading…
Add table
Reference in a new issue