no new p on single newline
authorGabriel Wicke <gwicke@users.mediawiki.org>
Sat, 10 Apr 2004 01:13:48 +0000 (01:13 +0000)
committerGabriel Wicke <gwicke@users.mediawiki.org>
Sat, 10 Apr 2004 01:13:48 +0000 (01:13 +0000)
includes/Parser.php

index da0bc0e..b602186 100644 (file)
@@ -261,7 +261,7 @@ class Parser
                $ti = $this->mTitle->getText() ;
                $ti = explode ( ":" , $ti , 2 ) ;
                if ( $cat != $ti[0] ) return "" ;
-               $r = "<br break='all' />\n" ;
+               $r = '<br style="clear:both;"/>\n';
 
                $articles = array() ;
                $parents = array () ;
@@ -1118,11 +1118,11 @@ class Parser
                                                        } else {
                                                                $t = '';
                                                        }
-                                               } else {
+                                               } else if ($this->mLastSection != $newSection or $newSection != 'p') {
                                                        $text .= $this->closeParagraph();
                                                        $text .= "<" . $newSection . ">";
                                                        $this->mLastSection = $newSection;
-                                               }
+                                               }                       
                                        }
 
                                }