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
Alrighty, now we properly remove old blocks before inserting the new one. (Bug 10080...
[lhc/web/wiklou.git]
/
includes
/
SpecialIpblocklist.php
diff --git
a/includes/SpecialIpblocklist.php
b/includes/SpecialIpblocklist.php
index
d6807d2
..
696c7ef
100644
(file)
--- a/
includes/SpecialIpblocklist.php
+++ b/
includes/SpecialIpblocklist.php
@@
-249,7
+249,7
@@
class IPUnblockForm {
$conds['ipb_auto'] = 0;
} else {
$user = User::newFromName( $this->ip );
$conds['ipb_auto'] = 0;
} else {
$user = User::newFromName( $this->ip );
- if ( $user && ( $id = $user->getI
D
() ) != 0 ) {
+ if ( $user && ( $id = $user->getI
d
() ) != 0 ) {
$conds['ipb_user'] = $id;
} else {
// Uh...?
$conds['ipb_user'] = $id;
} else {
// Uh...?
@@
-327,12
+327,7
@@
class IPUnblockForm {
$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
$properties = array();
$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
$properties = array();
- if ( $block->mExpiry === "" || $block->mExpiry === Block::infinity() ) {
- $properties[] = $msg['infiniteblock'];
- } else {
- $properties[] = wfMsgReplaceArgs( $msg['expiringblock'],
- array( $wgLang->timeanddate( $block->mExpiry, true ) ) );
- }
+ $properties[] = Block::formatExpiry( $block->mExpiry );
if ( $block->mAnonOnly ) {
$properties[] = $msg['anononlyblock'];
}
if ( $block->mAnonOnly ) {
$properties[] = $msg['anononlyblock'];
}