Add MessageDirect\Search tests

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

diff --git a/src/App/Page.php b/src/App/Page.php
index 1b499f614c064b9373579b6c11399f7c3af3a968..2b8fa26854e4db79e9e1c633859814df44f4fd7d 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -381,7 +381,10 @@ class Page implements ArrayAccess
                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 {
@@ -417,7 +420,6 @@ class Page implements ArrayAccess
                 */
                $timestamp = microtime(true);
                $this->initContent($response, $mode);
-               $profiler->set(microtime(true) - $timestamp, 'content');
 
                // Load current theme info after module has been initialized as theme could have been set in module
                $currentTheme = $app->getCurrentTheme();
@@ -445,6 +447,8 @@ class Page implements ArrayAccess
                 */
                $this->initFooter($app, $mode, $l10n);
 
+               $profiler->set(microtime(true) - $timestamp, 'aftermath');
+
                if (!$mode->isAjax()) {
                        Hook::callAll('page_end', $this->page['content']);
                }
@@ -456,10 +460,16 @@ class Page implements ArrayAccess
                }
 
                foreach ($response->getHeaders() as $key => $header) {
+                       if (is_array($header)) {
+                               $header_str = implode(',', $header);
+                       } else {
+                               $header_str = $header;
+                       }
+
                        if (empty($key)) {
-                               header($header);
+                               header($header_str);
                        } else {
-                               header("$key: $header");
+                               header("$key: $header_str");
                        }
                }