dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "thumb.php: Fix undefined variable $width"
[lhc/web/wiklou.git]
/
includes
/
Block.php
diff --git
a/includes/Block.php
b/includes/Block.php
index
3896369
..
c393a79
100644
(file)
--- a/
includes/Block.php
+++ b/
includes/Block.php
@@
-1368,7
+1368,7
@@
class Block {
$this->getId(),
$lang->formatExpiry( $this->mExpiry ),
(string)$intended,
- $lang->
timeanddate( wfTimestamp( TS_MW, $this->mTimestamp ), true
),
+ $lang->
userTimeAndDate( $this->mTimestamp, $context->getUser()
),
);
}
}