https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105756
Revision: 105756
Author: liangent
Date: 2011-12-10 08:40:11 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
Followup r100969: There may be Mac newlines as well.
Modified Paths:
--------------
trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php 2011-12-10
08:09:42 UTC (rev 105755)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php 2011-12-10
08:40:11 UTC (rev 105756)
@@ -302,10 +302,10 @@
function getMultiLineRow( $msg, $old, $new ) {
if ( !is_array( $old ) ) {
- $old = explode( "\n", str_replace( "\r", '', $old ) );
+ $old = explode( "\n", preg_replace( "/\\\r\\\n?/",
"\n", $old ) );
}
if ( !is_array( $new ) ) {
- $new = explode( "\n", str_replace( "\r", '', $new ) );
+ $new = explode( "\n", preg_replace( "/\\\r\\\n?/",
"\n", $new ) );
}
if ( $old == $new ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
