Merge enhanced RC change markers CSS fix from REL1_4

1 files changed, 16 insertions, 13 deletions

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 96a91d492c74..b739835751d0 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -54,17 +54,17 @@ class ChangesList {
 			$N = wfMsg( 'newpageletter' );
 
 			if ( $rc_type == RC_NEW ) {
-				$r .= $N ;
+				$r .= '<span class="newpage">' . htmlspecialchars( $N ) . '</span>';
 			} else {
 				$r .= '&nbsp;' ;
 			}
 			if ( $rc_minor ) {
-				$r .= $M ;
+				$r .= '<span class="minor">' . htmlspecialchars( $M ) . '</span>';
 			} else {
 				$r .= '&nbsp;' ;
 			}
 			if ( $rcObj->unpatrolled ) {
-				$r .= '!';
+				$r .= '<span class="unpatrolled">!</span>';
 			} else {
 				$r .= '&nbsp;';
 			}
@@ -162,11 +162,14 @@ class ChangesList {
 		# Main line
 		# M/N
 		$r .= '<tt>' ;
-		if ( $isnew ) $r .= $N ;
-		else $r .= '&nbsp;' ;
-		$r .= '&nbsp;' ; # Minor
+		if ( $isnew ) {
+			$r .= '<span class="newpage">' . htmlspecialchars( $N ) . '</span>';
+		} else {
+			$r .= '&nbsp;';
+		}
+		$r .= '&nbsp;'; # Minor
 		if ( $unpatrolled ) {
-			$r .= '!';
+			$r .= '<span class="unpatrolled">!</span>';
 		} else {
 			$r .= '&nbsp;';
 		}
@@ -214,19 +217,19 @@ class ChangesList {
 			$r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" />';
 			$r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ;
 			if ( $rc_new ) {
-				$r .= $N ;
+				$r .= '<span class="newpage">' . htmlspecialchars( $N ) . '</span>';
 			} else {
 				$r .= '&nbsp;' ;
 			}
 
 			if ( $rc_minor ) {
-				$r .= $M ;
+				$r .= '<span class="minoredit">' . htmlspecialchars( $M ) . '</span>';
 			} else {
 				$r .= '&nbsp;' ;
 			}
 
 			if ( $rcObj->unpatrolled ) {
-				$r .= '!';
+				$r .= '<span class="unpatrolled">!</span>';
 			} else {
 				$r .= '&nbsp;';
 			}
@@ -367,9 +370,9 @@ class ChangesList {
 			$s .= ') . . ';
 
 			# M, N and ! (minor, new and unpatrolled)
-			if ( $rc_minor ) { $s .= ' <span class="minoreditletter">'.$message["minoreditletter"].'</span>'; }
-			if ( $rc_type == RC_NEW ) { $s .= '<span class="newpageletter">'.$message["newpageletter"].'</span>'; }
-			if ( !$rc_patrolled ) { $s .= ' <span class="unpatrolled">!</span>'; }
+			if ( $rc_minor ) { $s .= ' <span class="minor">'.htmlspecialchars( $message["minoreditletter"] ).'</span>'; }
+			if ( $rc_type == RC_NEW ) { $s .= '<span class="newpage">'.htmlspecialchars( $message["newpageletter"] ).'</span>'; }
+			if ( $unpatrolled ) { $s .= ' <span class="unpatrolled">!</span>'; }
 
 			# Article link
 			# If it's a new article, there is no diff link, but if it hasn't been