From f9a6a1f03318161b3d6e9f431111ecdc0e95573c Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Mon, 2 Feb 2009 16:21:43 +0000
Subject: [PATCH] (bug 17236) Suppress 'watch user page link' for IP range
 blocks. Patch contributed by Mormegil.

---
 RELEASE-NOTES                        | 1 +
 includes/specials/SpecialBlockip.php | 4 +++-
 skins/common/block.js                | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1df6f30241..ee7d10a027 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -79,6 +79,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Styled #mw-data-after-content in cologneblue.css to match the rest of the font (bug 17110)
 * (bug 7556) Time zone names in signatures lack i18n
 * (bug 3311) Automatic category redirects
+* (bug 17236) Suppress 'watch user page link' for IP range blocks
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.
diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 6b60cd1bc0..da51d90849 100644
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -428,7 +428,9 @@ class IPBlockForm {
 			}
 			wfRunHooks('BlockIpComplete', array($block, $wgUser));
 
-			if ( $this->BlockWatchUser ) { 
+			if ( $this->BlockWatchUser &&
+				# Only show watch link when this is no range block
+				$block->mRangeStart == $block->mRangeEnd) {
 				$wgUser->addWatch ( Title::makeTitle( NS_USER, $this->BlockAddress ) );
 			}
 			
diff --git a/skins/common/block.js b/skins/common/block.js
index 6f7be0cd7b..90211efa7c 100644
--- a/skins/common/block.js
+++ b/skins/common/block.js
@@ -31,6 +31,7 @@ function updateBlockOptions() {
 	var addy = target.value;
 	var isEmpty = addy.match(/^\s*$/);
 	var isIp = addy.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|:(:[0-9A-Fa-f]{1,4}){1,7}|[0-9A-Fa-f]{1,4}(:{1,2}[0-9A-Fa-f]{1,4}|::$){1,7})(\/\d+)?$/);
+	var isIpRange = isIp && addy.match(/\/\d+$/);
 
 	var anonymousRow = document.getElementById('wpAnonOnlyRow');
 	if( anonymousRow ) {
@@ -51,4 +52,9 @@ function updateBlockOptions() {
 	if( hideuserRow ) {
 		hideuserRow.style.display = isIp && !isEmpty ? 'none' : '';
 	}
+
+	var watchuserRow = document.getElementById('wpEnableWatchUser');
+	if( watchuserRow ) {
+		watchuserRow.style.display = isIpRange && !isEmpty ? 'none' : '';
+	}
 }
-- 
2.20.1