dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fdd0e32
)
Follow up r77407. Do it Right.
author
Platonides
<platonides@users.mediawiki.org>
Sun, 28 Nov 2010 22:51:25 +0000
(22:51 +0000)
committer
Platonides
<platonides@users.mediawiki.org>
Sun, 28 Nov 2010 22:51:25 +0000
(22:51 +0000)
Fixes wfTimestamp() returning 0 instead of now.
includes/GlobalFunctions.php
patch
|
blob
|
history
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 = "@$
u
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 ) ) {