From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 19 Jun 2004 06:46:54 +0000 (+0000)
Subject: Show category links in preview
X-Git-Tag: 1.5.0alpha1~2815
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=72adcbd659a520fede0a436d9317bb9521f3608a;p=lhc%2Fweb%2Fwiklou.git

Show category links in preview
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 45c1262e8f..21dae85cc9 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -394,6 +394,7 @@ class EditPage {
 					$wgOut->addHTML($previewhead);
 					$wgOut->addHTML($previewHTML);
 				}
+				$wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
 				$wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
 				$wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
 			}
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 4f797d2b00..50d0d38bfe 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -189,6 +189,16 @@ class OutputPage {
 	function setLanguageLinks($newLinkArray) {
 		$this->mLanguageLinks = $newLinkArray;
 	}
+	function getCategoryLinks() {
+		return $this->mCategoryLinks;
+	} 
+	function addCategoryLinks($newLinkArray) {
+		$this->mCategoryLinks += $newLinkArray;
+	}
+	function setCategoryLinks($newLinkArray) {
+		$this->mCategoryLinks += $newLinkArray;
+	}
+
 	function suppressQuickbar() { $this->mSuppressQuickbar = true; }
 	function isQuickbarSuppressed() { return $this->mSuppressQuickbar; }
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 1b35625b03..7abcc8de6d 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -389,9 +389,12 @@ class Skin {
 	function getCategoryLinks () {
 		global $wgOut, $wgTitle, $wgUser, $wgParser;
 		global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgLang;
+	
 		if( !$wgUseCategoryMagic ) return '' ;
 		if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
-		if( !$wgOut->isArticle() ) return '';
+		
+		# Taken out so that they will be displayed in previews -- TS
+		#if( !$wgOut->isArticle() ) return '';
 		
 		$t = implode ( ' | ' , $wgOut->mCategoryLinks ) ;
 		$s = $this->makeKnownLink( 'Special:Categories',