Merge "Change mid-upload 'cancel' button to 'back'"

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0360d19..6e8ce8f 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2033,7 +2033,7 @@ function wfTimestampOrNull( $outputtype = TS_UNIX, $ts = null ) {
  */
 function wfTimestampNow() {
        # return NOW
-       return MWTimestamp::convert( TS_MW, time() );
+       return MWTimestamp::now( TS_MW );
 }
 
 /**