* (bug 13458) Preview/edit toolbar spacing now works consistently

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e15a5fd..8a3b51b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -160,6 +160,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12064) BeforePageDisplay hook is now called for all skins
 * (bug 13624) Fix regression with manual thumb= parameter on images
 * (bug 11039) Add missing labels on protection form
+* (bug 13458) Preview/edit toolbar spacing now works consistently
 
 
 === API changes in 1.13 ===

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5d29485..47405f1 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1567,7 +1567,7 @@ END
 
                        $parserOptions->setTidy(true);
                        $parserOptions->enableLimitReport();
-                       $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
+                       $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ),
                                        $this->mTitle, $parserOptions );
 
                        $previewHTML = $parserOutput->getText();
@@ -1595,9 +1595,16 @@ END
                if ( $this->isConflict ) {
                        $previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
                }
+               
+               if( $wgUser->getOption( 'previewontop' ) ) {
+                       // Spacer for the edit toolbar
+                       $previewfoot = '<p><br /></p>';
+               } else {
+                       $previewfoot = '';
+               }
 
                wfProfileOut( $fname );
-               return $previewhead . $previewHTML;
+               return $previewhead . $previewHTML . $previewfoot;
        }
 
        /**