From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 28 Nov 2010 22:40:29 +0000 (+0000)
Subject: Fix bug introduced in r77171
X-Git-Tag: 1.31.0-rc.0~33700
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=6c61f8f21cf69c40863753caa22858bcfd4780ef;p=lhc%2Fweb%2Fwiklou.git

Fix bug introduced in r77171
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 80093cabd4..771c00989a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1990,6 +1990,7 @@ function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
 	
 	if ( $ts === 0 ) {
 		$uts = time();
+		$strtime = "@$ts";
 	} 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 ) ) {