Added a check for "indefinite" if a local customization uses this value in [[MediaWiki:Ipboptions]].
Thanks to Rob.
This commit is contained in:
parent
49e9a54db7
commit
a219fbda88
1 changed files with 2 additions and 2 deletions
|
|
@ -751,14 +751,14 @@ class OutputPage {
|
||||||
|
|
||||||
$blockExpiry = $wgUser->mBlock->mExpiry;
|
$blockExpiry = $wgUser->mBlock->mExpiry;
|
||||||
if ( $blockExpiry == 'infinity' ) {
|
if ( $blockExpiry == 'infinity' ) {
|
||||||
// Entry in database (table ipblocks) is 'infinity' but 'ipboptions' uses 'infinite'
|
// Entry in database (table ipblocks) is 'infinity' but 'ipboptions' uses 'infinite' or 'indefinite'
|
||||||
// Search for localization in 'ipboptions'
|
// Search for localization in 'ipboptions'
|
||||||
$scBlockExpiryOptions = wfMsg( 'ipboptions' );
|
$scBlockExpiryOptions = wfMsg( 'ipboptions' );
|
||||||
foreach ( explode( ',', $scBlockExpiryOptions ) as $option ) {
|
foreach ( explode( ',', $scBlockExpiryOptions ) as $option ) {
|
||||||
if ( strpos( $option, ":" ) === false )
|
if ( strpos( $option, ":" ) === false )
|
||||||
continue;
|
continue;
|
||||||
list( $show, $value ) = explode( ":", $option );
|
list( $show, $value ) = explode( ":", $option );
|
||||||
if ( $value == 'infinite' ) {
|
if ( $value == 'infinite' || $value == 'indefinite' ) {
|
||||||
$blockExpiry = $show;
|
$blockExpiry = $show;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue