From 8fab89a6c45a0da2fd19b645d1a484d4ed05618c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 4 Feb 2007 18:42:07 +0000
Subject: [PATCH] Cleanup from r19742: * use diffchange class alone for
 backwards compatibility with old renderings and diff plugins * set
 text-decoration: none in diffs in RSS/Atom feeds * fix bad diff regex in
 UTF-8 RandomTest script

---
 includes/SpecialRecentchanges.php | 2 +-
 includes/normal/RandomTest.php    | 2 +-
 skins/chick/main.css              | 3 +--
 skins/common/common.css           | 7 +------
 skins/common/commonPrint.css      | 7 +------
 skins/monobook/handheld.css       | 2 +-
 skins/monobook/main.css           | 7 +------
 skins/simple/main.css             | 3 +--
 8 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index d0cec16bb6..9ded0af414 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -691,7 +691,7 @@ function rcApplyDiffStyle( $text ) {
 		'diff-addedline'   => 'background: #cfc; font-size: smaller;',
 		'diff-deletedline' => 'background: #ffa; font-size: smaller;',
 		'diff-context'     => 'background: #eee; font-size: smaller;',
-		'diffchange'       => 'color: red; font-weight: bold;',
+		'diffchange'       => 'color: red; font-weight: bold; text-decoration: none;',
 	);
 	
 	foreach( $styles as $class => $style ) {
diff --git a/includes/normal/RandomTest.php b/includes/normal/RandomTest.php
index de61b6f88d..9ccbc01d24 100644
--- a/includes/normal/RandomTest.php
+++ b/includes/normal/RandomTest.php
@@ -69,7 +69,7 @@ function showDiffs( $a, $b ) {
 	$formatter = new TableDiffFormatter();
 	$funky = $formatter->format( $diffs );
 	$matches = array();
-	preg_match_all( '/<(?:ins|del) class="diffchange">(.*?)<\/span>/', $funky, $matches );
+	preg_match_all( '/<(?:ins|del) class="diffchange">(.*?)<\/(?:ins|del)>/', $funky, $matches );
 	foreach( $matches[1] as $bit ) {
 		$hex = bin2hex( $bit );
 		echo "\t$hex\n";
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 4e92b98632..26d4f92549 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -415,8 +415,7 @@ td.diff-context {
     background:#eeeeee;
     font-size: smaller;
 }
-ins.diffchange { color: red; text-decoration: none; }
-del.diffchange { color: red; text-decoration: none; }
+.diffchange { color: red; text-decoration: none; }
 
 a.external { color: #3366bb; }
 
diff --git a/skins/common/common.css b/skins/common/common.css
index 03c325286f..92b4888375 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -125,12 +125,7 @@ td.diff-context {
     background:#eeeeee;
     font-size: 94%;
 }
-ins.diffchange {
-	color: red;
-	font-weight: bold;
-	text-decoration: none;
-}
-del.diffchange {
+.diffchange {
 	color: red;
 	font-weight: bold;
 	text-decoration: none;
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 2bd7e989b4..4fddafaad9 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -283,12 +283,7 @@ td.diff-context {
     background:#eeeeee;
     font-size: smaller;
 }
-ins.diffchange {
-    color: silver;
-    font-weight: bold;
-    text-decoration: underline;
-}
-del.diffchange {
+.diffchange {
     color: silver;
     font-weight: bold;
     text-decoration: underline;
diff --git a/skins/monobook/handheld.css b/skins/monobook/handheld.css
index 5ef6040018..754aba9f55 100644
--- a/skins/monobook/handheld.css
+++ b/skins/monobook/handheld.css
@@ -559,7 +559,7 @@ td.diff-context {
 	background: #eee;
 	font-size: smaller;
 }
-span.diffchange {
+.diffchange {
 	color: red;
 	font-weight: bold;
 }
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 903c972491..9a65693911 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -591,12 +591,7 @@ td.diff-context {
 	background: #eee;
 	font-size: smaller;
 }
-ins.diffchange {
-	color: red;
-	font-weight: bold;
-	text-decoration: none;
-}
-del.diffchange {
+.diffchange {
 	color: red;
 	font-weight: bold;
 	text-decoration: none;
diff --git a/skins/simple/main.css b/skins/simple/main.css
index 8e9f413f88..41d0b54706 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -268,8 +268,7 @@ td.diff-deletedline {
     background-color: #f8ffaa;
 }
 
-ins.diffchange { background-color: #FFCDF3; text-decoration: none; }
-del.diffchange { background-color: #FFCDF3; text-decoration: none; }
+.diffchange { background-color: #FFCDF3; text-decoration: none; }
 .autocomment { color:  grey; }
 #pagehistory span.user {
     margin-left: 1.4em;
-- 
2.20.1