http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100966
Revision: 100966
Author: liangent
Date: 2011-10-27 12:17:48 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Newline to <br> replacement should take place after escaping
Modified Paths:
--------------
trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php 2011-10-27
12:17:16 UTC (rev 100965)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php 2011-10-27
12:17:48 UTC (rev 100966)
@@ -296,8 +296,8 @@
}
if ( $format == 'text' ) {
- $old = htmlspecialchars( $old );
- $new = htmlspecialchars( $new );
+ $old = nl2br( htmlspecialchars( $old ) );
+ $new = nl2br( htmlspecialchars( $new ) );
}
$row .= Xml::tags( 'td', array( 'class' => $oldClass ), $old );
@@ -315,8 +315,8 @@
}
if ( $old == $new ) {
- $old = implode( "<br />\n", $old );
- $new = implode( "<br />\n", $new );
+ $old = implode( "\n", $old );
+ $new = implode( "\n", $new );
return $this->getSimpleRow( $msg, $old, $new, 'text' );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
