rendertime: Adding more variables for measuring performance.

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 87a32901924263bc0aec33f027ff2a73ff47e4ea..0792ce05c0d56ac180ac0f89f426303e13d6b275 100755 (executable)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -10,7 +10,6 @@
  */
 
 function rendertime_install() {
-       register_hook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
        register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
 }
 
@@ -21,15 +20,15 @@ function rendertime_uninstall() {
 }
 
 function rendertime_init_1(&$a) {
-       global $rendertime_start;
-
-       $rendertime_start = microtime(true);
 }
 
 function rendertime_page_end(&$a, &$o) {
-       global $rendertime_start;
 
-       $duration = round(microtime(true)-$rendertime_start, 3);
+       $duration = round(microtime(true)-$a->performance["start"], 3);
 
-       $o = $o.'<div class="renderinfo">'.sprintf(t("This page took %s seconds to render"), $duration)."</div>";
+       $o = $o.'<div class="renderinfo">'.sprintf(t("Rendertime: Database: %s, Network: %s, Rendering: %s, Total: %s"),
+                                               round($a->performance["database"], 3),
+                                               round($a->performance["network"], 3),
+                                               round($a->performance["rendering"], 3),
+                                               $duration)."</div>";
 }