From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 9 Oct 2004 08:41:55 +0000 (+0000)
Subject: Adjust spacing, and fix the disclaimer link again so it's separated from the printabl... 
X-Git-Tag: 1.5.0alpha1~1620
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=79ddcfc22b80aa761fd06c3b5b5d911243072361;p=lhc%2Fweb%2Fwiklou.git

Adjust spacing, and fix the disclaimer link again so it's separated from the printable link
---

diff --git a/includes/Skin.php b/includes/Skin.php
index ea445b7b6c..6e4f4476d0 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -451,6 +451,7 @@ class Skin {
 		return $s;
 	}
 
+	
 	function getCategoryLinks () {
 		global $wgOut, $wgTitle, $wgUser, $wgParser;
 		global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgLang;
@@ -544,7 +545,10 @@ class Skin {
 		$action = $wgRequest->getText( 'action' );
 
 		$s = $this->printableLink();
-	        $s .= $this->disclaimerLink(); # may be empty
+		$disclaimer = $this->disclaimerLink(); # may be empty
+		if( $disclaimer ) {
+			$s .= ' | ' . $disclaimer;
+		}
 
 		if ( $wgOut->isArticleRelated() ) {
 			if ( $wgTitle->getNamespace() == Namespace::getImage() ) {
@@ -976,12 +980,12 @@ class Skin {
 
 
 	function disclaimerLink() {
-	        $disclaimers = wfMsg( 'disclaimers' );
-	        if ($disclaimers == '-') {
-		    return "";
+		$disclaimers = wfMsg( 'disclaimers' );
+		if ($disclaimers == '-') {
+			return "";
 		} else {
-		    return $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
-						 $disclaimers );
+			return $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
+			                             $disclaimers );
 		}
 	}