Follow-up r83909: fix error on TWN
authorHappy-melon <happy-melon@users.mediawiki.org>
Mon, 14 Mar 2011 22:26:37 +0000 (22:26 +0000)
committerHappy-melon <happy-melon@users.mediawiki.org>
Mon, 14 Mar 2011 22:26:37 +0000 (22:26 +0000)
includes/specials/SpecialBlockList.php

index 3beab01..9682e37 100644 (file)
@@ -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(