From: Michael Vogel <ike@pirati.ca>
Date: Thu, 15 Sep 2016 09:55:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=73e98a4814098dec4b6212fdc750a30a0cb17ef0;p=friendica-addons.git

Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime

Conflicts:
	rendertime/rendertime.php
---

73e98a4814098dec4b6212fdc750a30a0cb17ef0
diff --cc rendertime/rendertime.php
index 38b50a53,574e6e09..d666c6a8
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@@ -26,20 -26,18 +26,21 @@@ function rendertime_page_end(&$a, &$o) 
  
  	$duration = microtime(true)-$a->performance["start"];
  
 -	if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet) {
 +	$ignored_modules = array("fbrowser");
 +	$ignored = in_array($a->module, $ignored_modules);
 +
 +	if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet AND !$ignored) {
- 		$o = $o.'<div class="renderinfo">'.sprintf(t("Database: %s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s"),
- 						round($a->performance["database"], 3),
- 						round($a->performance["network"], 3),
- 						round($a->performance["rendering"], 3),
- 						round($a->performance["parser"], 3),
- 						round($a->performance["file"], 3),
- 						round($duration - $a->performance["database"] - $a->performance["network"]
- 							 - $a->performance["rendering"] - $a->performance["parser"]
- 							 - $a->performance["file"], 3),
- 						round($duration, 3)
+ 		$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>";