Follow up r77407. Do it Right.

Fixes wfTimestamp() returning 0 instead of now.

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 771c009..0e977ba 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1990,7 +1990,7 @@ function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
        
        if ( $ts === 0 ) {
                $uts = time();
-               $strtime = "@$ts";
+               $strtime = "@$uts";
        } elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
                # TS_DB
        } elseif ( preg_match( '/^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {