| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -2979,16 +2979,16 @@ |
| 2980 | 2980 | * @return String |
| 2981 | 2981 | */ |
| 2982 | 2982 | public function formatExpiry( $expiry, $format = true ) { |
| 2983 | | - static $dbr, $msg; |
| 2984 | | - if( !$dbr ){ |
| 2985 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 2986 | | - $msg = wfMessage( 'infiniteblock' ); |
| | 2983 | + static $infinity, $infinityMsg; |
| | 2984 | + if( $infinity === null ){ |
| | 2985 | + $infinityMsg = wfMessage( 'infiniteblock' ); |
| | 2986 | + $infinity = wfGetDB( DB_SLAVE )->getInfinity(); |
| 2987 | 2987 | } |
| 2988 | 2988 | |
| 2989 | | - if ( $expiry == '' || $expiry == $dbr->getInfinity() ) { |
| | 2989 | + if ( $expiry == '' || $expiry == $infinity ) { |
| 2990 | 2990 | return $format === true |
| 2991 | | - ? $msg |
| 2992 | | - : $dbr->getInfinity(); |
| | 2991 | + ? $infinityMsg |
| | 2992 | + : $infinity; |
| 2993 | 2993 | } else { |
| 2994 | 2994 | return $format === true |
| 2995 | 2995 | ? $this->timeanddate( $expiry ) |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php |
| — | — | @@ -51,6 +51,7 @@ |
| 52 | 52 | $expiry = Block::decodeExpiry( $block->gb_expiry ); |
| 53 | 53 | $expiry = wfMsgExt( |
| 54 | 54 | 'expiringblock', |
| | 55 | + 'parseinline', |
| 55 | 56 | $wgLang->date( $expiry ), |
| 56 | 57 | $wgLang->time( $expiry ) |
| 57 | 58 | ); |
| Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php |
| — | — | @@ -142,6 +142,7 @@ |
| 143 | 143 | $expiry = Block::decodeExpiry( $expiry ); |
| 144 | 144 | $options[] = wfMsgExt( |
| 145 | 145 | 'expiringblock', |
| | 146 | + 'parseinline', |
| 146 | 147 | $wgLang->date( $expiry ), |
| 147 | 148 | $wgLang->time( $expiry ) |
| 148 | 149 | ); |