mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-07 15:54:26 +02:00
Fix exception module not setting the HTTP response code
- Page->run now returns an updated response for use with Page->exit - Remove now duplicated header setting in Page->run - Remove now obsolete (and ineffective) HTTP return code setting from Module\Special\HTTPException->content - Add HTTP response code and reason setting in BaseModule->run
This commit is contained in:
parent
a39029f953
commit
3748adf2fd
4 changed files with 11 additions and 19 deletions
|
@ -39,6 +39,7 @@ use Friendica\Network\HTTPException;
|
|||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Profiler;
|
||||
use Friendica\Util\Strings;
|
||||
use GuzzleHttp\Psr7\Utils;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
||||
/**
|
||||
|
@ -499,20 +500,6 @@ class Page implements ArrayAccess
|
|||
$this->page['nav'] = $nav->getHtml();
|
||||
}
|
||||
|
||||
foreach ($response->getHeaders() as $key => $header) {
|
||||
if (is_array($header)) {
|
||||
$header_str = implode(',', $header);
|
||||
} else {
|
||||
$header_str = $header;
|
||||
}
|
||||
|
||||
if (empty($key)) {
|
||||
header($header_str);
|
||||
} else {
|
||||
header("$key: $header_str");
|
||||
}
|
||||
}
|
||||
|
||||
// Build the page - now that we have all the components
|
||||
if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
|
||||
$doc = new DOMDocument();
|
||||
|
@ -583,6 +570,10 @@ class Page implements ArrayAccess
|
|||
// Used as is in view/php/default.php
|
||||
$lang = $l10n->getCurrentLang();
|
||||
|
||||
ob_start();
|
||||
require_once $template;
|
||||
$body = ob_get_clean();
|
||||
|
||||
return $response->withBody(Utils::streamFor($body));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue