From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Mon, 14 Mar 2011 22:26:37 +0000 (+0000)
Subject: Follow-up r83909: fix error on TWN
X-Git-Tag: 1.31.0-rc.0~31405
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=411262dab40fd49123d32c388f0c9a7bab9fcacc;p=lhc%2Fweb%2Fwiklou.git

Follow-up r83909: fix error on TWN
---

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 3beab0133c..9682e3777b 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -265,6 +265,7 @@ class BlockListPager extends TablePager {
 				'blocklist-nousertalk',
 				'unblocklink',
 				'change-blocklink',
+				'infiniteblock',
 			);
 			$msg = array_combine( $msg, array_map( 'wfMessage', $msg ) );
 		}
@@ -300,7 +301,9 @@ class BlockListPager extends TablePager {
 				break;
 
 			case 'ipb_expiry':
-				$formatted = $wgLang->timeanddate( $value );
+				$formatted = $value == Block::infinity()
+					? $msg['infiniteblock']
+					: $wgLang->timeanddate( $value );
 				if( $wgUser->isAllowed( 'block' ) ){
 					if( $row->ipb_auto ){
 						$links[] = $sk->linkKnown(