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

Conflicts:
	rendertime/rendertime.php

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 574e6e0951b72087586704e0e618fb582d7b8c6b..d666c6a864309e3db498e3646cbc78cfb3bde74c 100755 (executable)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -26,7 +26,10 @@ 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/%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),