From c78f613b38a2c9d87d48485f350d32007a60f68c Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Sun, 19 Feb 2012 13:06:18 +0000
Subject: [PATCH] Bug 27619: Remove the option to show broken links as: link?

Being bold here, but otherwise it will still be there in 2016
---
 RELEASE-NOTES-1.20                                         | 1 +
 includes/DefaultSettings.php                               | 1 -
 includes/Preferences.php                                   | 5 -----
 .../resourceloader/ResourceLoaderUserCSSPrefsModule.php    | 7 -------
 skins/Simple.php                                           | 7 -------
 skins/nostalgia/screen.css                                 | 4 ++++
 skins/simple/main.css                                      | 1 +
 7 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index aa5edcb840..1889c55599 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -20,6 +20,7 @@ production.
 * (bug 31417) New ID mw-content-text around the actual page text, without categories,
   contentSub, ... The same div often also contains the class mw-content-ltr/rtl.
 * (bug 34475) Add support for IP/CIDR notation to tablesorter
+* (bug 27619) Remove preference option to display broken links as link?
 
 === Bug fixes in 1.20 ===
 * (bug 30245) Use the correct way to construct a log page title.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index aa589eb459..1b43d0cd68 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3231,7 +3231,6 @@ $wgDefaultUserOptions = array(
 	'gender'                  => 'unknown',
 	'hideminor'               => 0,
 	'hidepatrolled'           => 0,
-	'highlightbroken'         => 1,
 	'imagesize'               => 2,
 	'justify'                 => 0,
 	'math'                    => 1,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 2b4d352dd0..1baf453545 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -638,11 +638,6 @@ class Preferences {
 		);
 
 		if ( $wgAllowUserCssPrefs ) {
-			$defaultPreferences['highlightbroken'] = array(
-				'type' => 'toggle',
-				'section' => 'rendering/advancedrendering',
-				'label' => $context->msg( 'tog-highlightbroken' )->text(), // Raw HTML
-			);
 			$defaultPreferences['showtoc'] = array(
 				'type' => 'toggle',
 				'section' => 'rendering/advancedrendering',
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index b5a24354e0..80b767b395 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -92,13 +92,6 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 				$rules[] = 'a:lang(ar), a:lang(ckb), a:lang(fa),a:lang(kk-arab), ' .
 				'a:lang(mzn), a:lang(ps), a:lang(ur) { text-decoration: none; }';
 			}
-			if ( $options['highlightbroken'] ) {
-				$rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n";
-			} else {
-				$rules[] = "a.new, #quickbar a.new, a.stub, #quickbar a.stub { color: inherit; }";
-				$rules[] = "a.new:after, #quickbar a.new:after { content: '?'; color: #ba0000; }";
-				$rules[] = "a.stub:after, #quickbar a.stub:after { content: '!'; color: #772233; }";
-			}
 			if ( $options['justify'] ) {
 				$rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n";
 			}
diff --git a/skins/Simple.php b/skins/Simple.php
index 54be9f7d7d..0e1668b137 100644
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -36,13 +36,6 @@ class SkinSimple extends SkinTemplate {
 		if ( $this->getUser()->getOption( 'underline' ) < 2 ) {
 			$underline = "text-decoration: " . $this->getUser()->getOption( 'underline' ) ? 'underline !important' : 'none' . ";";
 		}
-
-		/* Also inherits from resourceloader */
-		if( !$this->getUser()->getOption( 'highlightbroken' ) ) {
-			$rules[] = "a.new, a.stub { color: inherit; text-decoration: inherit;}";
-			$rules[] = "a.new:after { color: #CC2200; $underline;}";
-			$rules[] = "a.stub:after { $underline; }";
-		}
 		$style = implode( "\n", $rules );
 		$out->addInlineStyle( $style, 'flip' );
 
diff --git a/skins/nostalgia/screen.css b/skins/nostalgia/screen.css
index d618362322..aed5715b1f 100644
--- a/skins/nostalgia/screen.css
+++ b/skins/nostalgia/screen.css
@@ -14,6 +14,10 @@ body {
 	padding: 2px;
 }
 
+a.new {
+	color: #ba0000;
+}
+
 a.interwiki,
 a.external {
 	color: #3366BB;
diff --git a/skins/simple/main.css b/skins/simple/main.css
index 3e0865860a..b2e70baea6 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -345,6 +345,7 @@ a.stub {
 }
 a.new,
 #p-personal a.new {
+	color: #BA0000;
 	text-decoration: line-through;
 }
 li.new {
-- 
2.20.1