clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11082 from annando/Fix-rendertime 

Fix the performance calculation for the content
This commit is contained in:
Hypolite Petovan 2021-12-09 08:39:05 -05:00 committed by GitHub
parent 0f365a087e 7218d6e171
commit e2ff48375f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.php
View File

@ -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 {

3
src/App/Page.php
View File

@ -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']);
}