Merge pull request #310 from annando/1509-not-at-minimal

Don't show the rendertime data and jappix in minimal mode.
pull/314/head
Tobias Diekershoff 2015-09-26 12:39:19 +02:00
commit ed09443ee9
2 changed files with 4 additions and 1 deletions

View File

@ -439,6 +439,9 @@ function jappixmini_script(&$a,&$s) {
if(! local_user()) return; if(! local_user()) return;
if ($_GET["mode"] == "minimal")
return;
$activate = get_pconfig(local_user(),'jappixmini','activate'); $activate = get_pconfig(local_user(),'jappixmini','activate');
$dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat'); $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat');
if (!$activate or $dontinsertchat) return; if (!$activate or $dontinsertchat) return;

View File

@ -26,7 +26,7 @@ function rendertime_page_end(&$a, &$o) {
$duration = microtime(true)-$a->performance["start"]; $duration = microtime(true)-$a->performance["start"];
if (is_site_admin()) if (is_site_admin() AND ($_GET["mode"] != "minimal"))
$o = $o.'<div class="renderinfo">'.sprintf(t("Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"), $o = $o.'<div class="renderinfo">'.sprintf(t("Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"),
round($a->performance["database"], 3), round($a->performance["database"], 3),
round($a->performance["network"], 3), round($a->performance["network"], 3),