Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -1,6 +1,4 @@
<?php
/**
* Name: rendertime
* Description: Shows the time that was needed to render the current page
@ -8,15 +6,18 @@
* Author: Michael Vvogel <http://pirati.ca/profile/heluecht>
*
*/
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
function rendertime_install() {
register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
Addon::registerHook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
}
function rendertime_uninstall() {
unregister_hook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
unregister_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
Addon::unregisterHook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
Addon::unregisterHook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
}
function rendertime_init_1(&$a) {
@ -30,20 +31,20 @@ function rendertime_page_end(&$a, &$o) {
$ignored = in_array($a->module, $ignored_modules);
if (is_site_admin() && ($_GET["mode"] != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) {
$o = $o.'<div class="renderinfo">'.sprintf(t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s"),
round($a->performance["database"] - $a->performance["database_write"], 3),
round($a->performance["database_write"], 3),
round($a->performance["network"], 2),
round($a->performance["rendering"], 2),
round($a->performance["parser"], 2),
round($a->performance["file"], 2),
round($duration - $a->performance["database"]
- $a->performance["network"] - $a->performance["rendering"]
- $a->performance["parser"] - $a->performance["file"], 2),
round($duration, 2)
//round($a->performance["markstart"], 3)
//round($a->performance["plugin"], 3)
)."</div>";
$o = $o.'<div class="renderinfo">'. L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
round($a->performance["database"] - $a->performance["database_write"], 3),
round($a->performance["database_write"], 3),
round($a->performance["network"], 2),
round($a->performance["rendering"], 2),
round($a->performance["parser"], 2),
round($a->performance["file"], 2),
round($duration - $a->performance["database"]
- $a->performance["network"] - $a->performance["rendering"]
- $a->performance["parser"] - $a->performance["file"], 2),
round($duration, 2)
//round($a->performance["markstart"], 3)
//round($a->performance["plugin"], 3)
)."</div>";
if (get_config("rendertime", "callstack")) {
$o .= "<pre>";