Replaced uses of microtime() with wfTime() where possible.

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index eac5e55..e77cb55 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -200,8 +200,7 @@ function logProfilingData()
 {
        global $wgRequestTime, $wgDebugLogFile;
        global $wgProfiling, $wgProfileStack, $wgProfileLimit, $wgUser;
-       list( $usec, $sec ) = explode( " ", microtime() );
-       $now = (float)$sec + (float)$usec;
+       $now = wfTime();
 
        list( $usec, $sec ) = explode( " ", $wgRequestTime );
        $start = (float)$sec + (float)$usec;

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 1285ebc..9c79878 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -401,9 +401,7 @@ class OutputPage {
        {
                global $wgRequestTime;
 
-               list( $usec, $sec ) = explode( " ", microtime() );
-               $now = (float)$sec + (float)$usec;
-
+               $now = wfTime();
                list( $usec, $sec ) = explode( " ", $wgRequestTime );
                $start = (float)$sec + (float)$usec;
                $elapsed = $now - $start;

diff --git a/includes/SpecialAsksql.php b/includes/SpecialAsksql.php
index b4280b3..b5116ef 100644 (file)
--- a/includes/SpecialAsksql.php
+++ b/includes/SpecialAsksql.php
@@ -156,16 +156,14 @@ class SqlQueryForm {
                        " query by " . $wgUser->getName() .
                        ":\n$q\n" );
                fclose( $f );
-               $this->starttime = microtime();
+               $this->starttime = wfTime();
        }
        
        function logFinishedQuery() {
                global $wgSqlLogFile, $wgLogQueries;
                if(!$wgLogQueries) return;
                
-               list($sec, $usec) = explode( " ", microtime() );
-               list($sec1, $usec1) = explode( " ", $this->starttime );
-               $interval = ($sec + $usec) - ($sec1 + $usec1);
+               $interval = wfTime() - $this->starttime;
                
                $f = fopen( $wgSqlLogFile, "a" );
                fputs( $f, "finished at " . wfTimestampNow() . "; took $interval secs\n" );