From 7218d6e1718a2ee50ff32ef07868db47113f2598 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 9 Dec 2021 13:04:51 +0000 Subject: [PATCH] Fix the performance calculation for the content --- src/App.php | 2 ++ src/App/Page.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/App.php b/src/App.php index d6532c445..9cbac155b 100644 --- a/src/App.php +++ b/src/App.php @@ -707,7 +707,9 @@ class App $input = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST); // Let the module run it's internal process (init, get, post, ...) + $timestamp = microtime(true); $response = $module->run($input); + $this->profiler->set(microtime(true) - $timestamp, 'content'); if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) { $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig); } else { diff --git a/src/App/Page.php b/src/App/Page.php index 479abfed9..2b8fa2685 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -420,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(); @@ -448,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']); }