From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 14 Dec 2004 05:30:33 +0000 (+0000)
Subject: * (bug 1090) Fix sitesupport links in CB/classic skins
X-Git-Tag: 1.5.0alpha1~1092
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=06e4b5687143508e99d1b93e7d4e3e20549b77d5;p=lhc%2Fweb%2Fwiklou.git

* (bug 1090) Fix sitesupport links in CB/classic skins
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 20ed3b4a08..ee0c91b267 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -173,9 +173,10 @@ class SkinCologneBlue extends Skin {
 
 		foreach ( $wgNavigationLinks as $link ) {
 			$msg = wfMsgForContent( $link['href'] );
-			if ( $msg != '-' ) {
+			$text = wfMsg( $link['text'] );
+			if ( $msg != '-' && $text != '-' ) {
 				$s .= '<a href="' . $this->makeInternalOrExternalUrl( $msg ) . '">' .
-					wfMsg( $link['text'] ) . '</a>' . $sep;
+					htmlspecialchars( $text ) . '</a>' . $sep;
 			}
 		}
 
diff --git a/skins/Standard.php b/skins/Standard.php
index 155331d6fe..1bc379ff5d 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -148,9 +148,10 @@ class SkinStandard extends Skin {
 
 		foreach ( $wgNavigationLinks as $link ) {
 			$msg = wfMsgForContent( $link['href'] );
-			if ( $msg != '-' ) {
+			$text = wfMsg( $link['text'] );
+			if ( $msg != '-' && $text != '-' ) {
 				$s .= '<a href="' . $this->makeInternalOrExternalUrl( $msg ) . '">' .
-					wfMsg( $link['text'] ) . '</a>' . $sep;
+					htmlspecialchars( $text ) . '</a>' . $sep;
 			}
 		}