From 378e29e5dff1d0f35b1955db16bb8f57d946c025 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 1 Aug 2009 12:41:45 +0000
Subject: [PATCH] Per Nikerabbit's comment on r53897 (i.e. fix for r53832,
 second attempt): changed "m" modifier to "D" so that $ really only matches
 the end of the string

---
 includes/parser/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index ad4d732d31..c81cf84d7d 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1705,7 +1705,7 @@ class Parser
 
 				if ( $ns == NS_CATEGORY ) {
 					wfProfileIn( __METHOD__."-category" );
-					$s = preg_replace( "/(\s*\n)+\s*$/m", '', $s ); # bug 87
+					$s = preg_replace( "/(\s*\n)+\s*$/D", '', $s ); # bug 87
 
 					if ( $wasblank ) {
 						$sortkey = $this->getDefaultSort();
-- 
2.20.1