(bug 8440) Fix ipblocklist to show new allow usertalk flag.

diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index 696c7ef..6bd53f1 100644 (file)
--- a/includes/specials/SpecialIpblocklist.php
+++ b/includes/specials/SpecialIpblocklist.php
@@ -292,7 +292,7 @@ class IPUnblockForm {
         * Callback function to output a block
         */
        function formatRow( $block ) {
-               global $wgUser, $wgLang;
+               global $wgUser, $wgLang, $wgBlockAllowsUTEdit;
 
                wfProfileIn( __METHOD__ );
 
@@ -303,7 +303,7 @@ class IPUnblockForm {
                if( is_null( $msg ) ) {
                        $msg = array();
                        $keys = array( 'infiniteblock', 'expiringblock', 'unblocklink',
-                               'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock' );
+                               'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock', 'nousertalk' );
                        foreach( $keys as $key ) {
                                $msg[$key] = wfMsgHtml( $key );
                        }
@@ -341,6 +341,10 @@ class IPUnblockForm {
                if ( $block->mBlockEmail && $block->mUser ) {
                        $properties[] = $msg['emailblock'];
                }
+               
+               if ( !$block->mAllowUsertalk && $wgBlockAllowsUTEdit ) {
+                       $properties[] = $msg['nousertalk'];
+               }
 
                $properties = implode( ', ', $properties );
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 8026c7e..bc91470 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2530,6 +2530,7 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'noautoblockblock'                => 'autoblock disabled',
 'createaccountblock'              => 'account creation blocked',
 'emailblock'                      => 'e-mail blocked',
+'nousertalk'                      => 'cannot edit usertalk',
 'ipblocklist-empty'               => 'The blocklist is empty.',
 'ipblocklist-no-results'          => 'The requested IP address or username is not blocked.',
 'blocklink'                       => 'block',