Pass in $join_conds

[lhc/web/wiklou.git] / includes / ProfilerSimple.php

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index 20ab99c..d3b8f45 100644 (file)
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -12,7 +12,7 @@ class ProfilerSimple extends Profiler {
        var $mProfileID = false;
 
        function __construct() {
-               global $wgRequestTime,$wgRUstart;
+               global $wgRequestTime, $wgRUstart;
                if (!empty($wgRequestTime) && !empty($wgRUstart)) {
                        $this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
 
@@ -105,7 +105,7 @@ class ProfilerSimple extends Profiler {
                if ( function_exists( 'getrusage' ) ) {
                        if ( $ru == null )
                                $ru = getrusage();
-                       return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] + 
+                       return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] +
                                $ru['ru_stime.tv_usec']) * 1e-6);
                } else {
                        return 0;
@@ -119,11 +119,4 @@ class ProfilerSimple extends Profiler {
                list($a,$b)=explode(" ",$time);
                return (float)($a+$b);
        }
-
-       function debug( $s ) {
-               if (function_exists( 'wfDebug' ) ) {
-                       wfDebug( $s );
-               }
-       }
 }
-