| Index: trunk/phase3/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | * Callback function to output a block |
| 294 | 294 | */ |
| 295 | 295 | function formatRow( $block ) { |
| 296 | | - global $wgUser, $wgLang; |
| | 296 | + global $wgUser, $wgLang, $wgBlockAllowsUTEdit; |
| 297 | 297 | |
| 298 | 298 | wfProfileIn( __METHOD__ ); |
| 299 | 299 | |
| — | — | @@ -303,7 +303,7 @@ |
| 304 | 304 | if( is_null( $msg ) ) { |
| 305 | 305 | $msg = array(); |
| 306 | 306 | $keys = array( 'infiniteblock', 'expiringblock', 'unblocklink', |
| 307 | | - 'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock' ); |
| | 307 | + 'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock', 'nousertalk' ); |
| 308 | 308 | foreach( $keys as $key ) { |
| 309 | 309 | $msg[$key] = wfMsgHtml( $key ); |
| 310 | 310 | } |
| — | — | @@ -341,6 +341,10 @@ |
| 342 | 342 | if ( $block->mBlockEmail && $block->mUser ) { |
| 343 | 343 | $properties[] = $msg['emailblock']; |
| 344 | 344 | } |
| | 345 | + |
| | 346 | + if ( !$block->mAllowUsertalk && $wgBlockAllowsUTEdit ) { |
| | 347 | + $properties[] = $msg['nousertalk']; |
| | 348 | + } |
| 345 | 349 | |
| 346 | 350 | $properties = implode( ', ', $properties ); |
| 347 | 351 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2530,6 +2530,7 @@ |
| 2531 | 2531 | 'noautoblockblock' => 'autoblock disabled', |
| 2532 | 2532 | 'createaccountblock' => 'account creation blocked', |
| 2533 | 2533 | 'emailblock' => 'e-mail blocked', |
| | 2534 | +'nousertalk' => 'cannot edit usertalk', |
| 2534 | 2535 | 'ipblocklist-empty' => 'The blocklist is empty.', |
| 2535 | 2536 | 'ipblocklist-no-results' => 'The requested IP address or username is not blocked.', |
| 2536 | 2537 | 'blocklink' => 'block', |