From: Raimond Spekking Date: Fri, 4 May 2007 05:46:44 +0000 (+0000) Subject: Added a check for "indefinite" if a local customization uses this value in [[MediaWik... X-Git-Tag: 1.31.0-rc.0~53093 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=a219fbda88bbb215d688bfbd54593c430a4493c4;p=lhc%2Fweb%2Fwiklou.git Added a check for "indefinite" if a local customization uses this value in [[MediaWiki:Ipboptions]]. Thanks to Rob. --- diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 2802cad09c..18a5be4893 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -751,14 +751,14 @@ class OutputPage { $blockExpiry = $wgUser->mBlock->mExpiry; 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' $scBlockExpiryOptions = wfMsg( 'ipboptions' ); foreach ( explode( ',', $scBlockExpiryOptions ) as $option ) { if ( strpos( $option, ":" ) === false ) continue; list( $show, $value ) = explode( ":", $option ); - if ( $value == 'infinite' ) { + if ( $value == 'infinite' || $value == 'indefinite' ) { $blockExpiry = $show; break; }