Merge remote-tracking branch 'upstream/develop' into baseurl

[friendica.git] / src / App / Page.php

diff --git a/src/App/Page.php b/src/App/Page.php
index 6252d9a88aea17af5656df43f9f75294eb3c8146..e369d482e83610617105b9718b46bd2bca9d9d92 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -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;
 
 /**
@@ -244,10 +245,12 @@ class Page implements ArrayAccess
                 */
                $this->page['htmlhead'] = Renderer::replaceMacros($tpl, [
                        '$l10n' => [
-                               'delitem'        => $l10n->t('Delete this item?'),
-                               'blockAuthor'    => $l10n->t('Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'),
-                               'ignoreAuthor'   => $l10n->t('Ignore this author? You won\'t be able to see their posts and their notifications.'),
-                               'collapseAuthor' => $l10n->t('Collapse this author\'s posts?'),
+                               'delitem'          => $l10n->t('Delete this item?'),
+                               'blockAuthor'      => $l10n->t("Block this author? They won't be able to follow you nor see your public posts, and you won't be able to see their posts and their notifications."),
+                               'ignoreAuthor'     => $l10n->t("Ignore this author? You won't be able to see their posts and their notifications."),
+                               'collapseAuthor'   => $l10n->t("Collapse this author's posts?"),
+                               'ignoreServer'     => $l10n->t("Ignore this author's server?"),
+                               'ignoreServerDesc' => $l10n->t("You won't see any content from this server including reshares in your Network page, the community pages and individual conversations."),
 
                                'likeError'     => $l10n->t('Like not successful'),
                                'dislikeError'  => $l10n->t('Dislike not successful'),
@@ -499,20 +502,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 +572,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));
        }
 }