From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 3 Nov 2005 22:40:02 +0000 (+0000)
Subject: * (bug 3487) Fix category edit preview with preview-on-bottom
X-Git-Tag: 1.6.0~1226
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=4b85ab4a10beabc9249f98d40e8aeddf00223e08;p=lhc%2Fweb%2Fwiklou.git

* (bug 3487) Fix category edit preview with preview-on-bottom
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 624642f1a8..467cc62c56 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -200,6 +200,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3845) Update attribute.php for 1.5 schema
 * changed directory hierarchy in images/math/. System upgrades from old to
   new hierarchy on the fly.
+* (bug 3487) Fix category edit preview with preview-on-bottom
 
 
 === Caveats ===
diff --git a/includes/EditPage.php b/includes/EditPage.php
index d1d0e20bb4..002f0ed7eb 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -771,18 +771,9 @@ class EditPage {
 
 		$checkboxhtml = $minoredithtml . $watchhtml;
 
-		$wgOut->addHTML( '<div id="wikiPreview">' );
-		if ( 'preview' == $this->formtype) {
-			$previewOutput = $this->getPreviewText();
-			if ( $wgUser->getOption('previewontop' ) ) {
-				$wgOut->addHTML( $previewOutput );
-				if($this->mTitle->getNamespace() == NS_CATEGORY) {
-					$this->mArticle->closeShowCategory();
-				}
-				$wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
-			}
+		if ( 'preview' == $this->formtype && $wgUser->getOption( 'previewontop' ) ) {
+			$this->showPreview();
 		}
-		$wgOut->addHTML( '</div>' );
 		if ( 'diff' == $this->formtype ) {
 			if ( $wgUser->getOption('previewontop' ) ) {
 				$wgOut->addHTML( $this->getDiff() );
@@ -912,7 +903,7 @@ END
 		}
 		$wgOut->addHTML( "</form>\n" );
 		if ( $this->formtype == 'preview' && !$wgUser->getOption( 'previewontop' ) ) {
-			$wgOut->addHTML( '<div id="wikiPreview">' . $previewOutput . '</div>' );
+			$this->showPreview();
 		}
 		if ( $this->formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
 			#$wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
@@ -921,6 +912,26 @@ END
 
 		wfProfileOut( $fname );
 	}
+	
+	/**
+	 * Append preview output to $wgOut.
+	 * Includes category rendering if this is a category page.
+	 * @access private
+	 */
+	function showPreview() {
+		global $wgOut;
+		$wgOut->addHTML( '<div id="wikiPreview">' );
+		if($this->mTitle->getNamespace() == NS_CATEGORY) {
+			$this->mArticle->openShowCategory();
+		}
+		$previewOutput = $this->getPreviewText();
+		$wgOut->addHTML( $previewOutput );
+		if($this->mTitle->getNamespace() == NS_CATEGORY) {
+			$this->mArticle->closeShowCategory();
+		}
+		$wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
+		$wgOut->addHTML( '</div>' );
+	}
 
 	/**
 	 * Prepare a list of templates used by this page. Returns HTML.