Per Simetrical's comment on r53832: only trim if there're newlines

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index aaf848f..ad4d732 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 = rtrim( $s, "\n" ); # bug 87
+                                       $s = preg_replace( "/(\s*\n)+\s*$/m", '', $s ); # bug 87
 
                                        if ( $wasblank ) {
                                                $sortkey = $this->getDefaultSort();