From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 28 Nov 2010 22:51:25 +0000 (+0000)
Subject: Follow up r77407. Do it Right.
X-Git-Tag: 1.31.0-rc.0~33698
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/?a=commitdiff_plain;h=ba3fd81ced90952133b9f8a8a33169ff56f19de5;p=lhc%2Fweb%2Fwiklou.git

Follow up r77407. Do it Right.
Fixes wfTimestamp() returning 0 instead of now.
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 771c00989a..0e977bad37 100644
--- 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 ) ) {