From: Matt Johnston <mattj@users.mediawiki.org>
Date: Thu, 2 Oct 2008 08:41:10 +0000 (+0000)
Subject: (bug 8440) Fix ipblocklist to show new allow usertalk flag.
X-Git-Tag: 1.31.0-rc.0~44961
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=e4dd2213e3f11ccc2d94e8022fa819ffa72a9132;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index 696c7efe84..6bd53f150a 100644
--- 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 8026c7eca7..bc91470135 100644
--- 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',