Per Nikerabbit's comment on r53897 (i.e. fix for r53832, second attempt): changed...

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index ad4d732..c81cf84 100644 (file)
--- 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();