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

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 20ed3b4..ee0c91b 100644 (file)
--- 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 155331d..1bc379f 100644 (file)
--- 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;
                        }
                }