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

Conflicts:
	rendertime/rendertime.php

diff --cc rendertime/rendertime.php
index 38b50a53899ed169f664a8112be0d9a4af510a1b,574e6e0951b72087586704e0e618fb582d7b8c6b..d666c6a864309e3db498e3646cbc78cfb3bde74c
--- 1/rendertime/rendertime.php
--- 2/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>";