follow up r53582: remove duped line :/

[lhc/web/wiklou.git] / skins / CologneBlue.php

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 21bc1dc..64a18f4 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -79,7 +79,13 @@ class SkinCologneBlue extends Skin {
 
                $s .= $this->bottomLinks();
                $s .= $wgLang->pipeList( array(
-                       "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ),
+                       "\n<br />" . $this->link(
+                               Title::newMainPage(),
+                               null,
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       ),
                        $this->aboutLink(),
                        $this->searchForm( wfMsg( 'qbfind' ) )
                ) );
@@ -123,22 +129,31 @@ class SkinCologneBlue extends Skin {
        }
 
        function sysLinks() {
-               global $wgUser, $wgLang, $wgContLang, $wgOut;
+               global $wgUser, $wgLang, $wgContLang;
                $li = $wgContLang->specialPage( 'Userlogin' );
                $lo = $wgContLang->specialPage( 'Userlogout' );
 
-               $rt = $wgOut->getTitle()->getPrefixedURL();
+               $rt = $this->mTitle->getPrefixedURL();
                if ( 0 == strcasecmp( urlencode( $lo ), $rt ) ) {
-                       $q = '';
+                       $q = array();
                } else {
-                       $q = "returnto={$rt}";
+                       $q = array( 'returnto' => $rt );
                }
 
                $s = array(
                        $this->mainPageLink(),
-                       $this->makeKnownLink( wfMsgForContent( 'aboutpage' ), wfMsg( 'about' ) ),
-                       $this->makeKnownLink( wfMsgForContent( 'helppage' ), wfMsg( 'help' ) ),
-                       $this->makeKnownLink( wfMsgForContent( 'faqpage' ), wfMsg( 'faq' ) ),
+                       $this->linkKnown(
+                               Title::newFromText( wfMsgForContent( 'aboutpage' ) ),
+                               wfMsg( 'about' )
+                       ),
+                       $this->linkKnown(
+                               Title::newFromText( wfMsgForContent( 'helppage' ) ),
+                               wfMsg( 'help' )
+                       ),
+                       $this->linkKnown(
+                               Title::newFromText( wfMsgForContent( 'faqpage' ) ),
+                               wfMsg( 'faq' )
+                       ),
                        $this->specialLink( 'specialpages' )
                );
 
@@ -150,9 +165,19 @@ class SkinCologneBlue extends Skin {
                        $s[] = $this->extensionTabLinks();
                }
                if ( $wgUser->isLoggedIn() ) {
-                       $s[] = $this->makeKnownLink( $lo, wfMsg( 'logout' ), $q );
+                       $s[] = $this->linkKnown(
+                               $lo,
+                               wfMsg( 'logout' ),
+                               array(),
+                               $q
+                       );
                } else {
-                       $s[] = $this->makeKnownLink( $li, wfMsg( 'login' ), $q );
+                       $s[] = $this->linkKnown(
+                               $li,
+                               wfMsg( 'login' ),
+                               array(),
+                               $q
+                       );
                }
 
                return $wgLang->pipeList( $s );
@@ -165,7 +190,7 @@ class SkinCologneBlue extends Skin {
        function quickBar(){
                global $wgOut, $wgUser, $wgEnableUploads;
 
-               $tns = $wgOut->getTitle()->getNamespace();
+               $tns = $this->mTitle->getNamespace();
 
                $s = "\n<div id='quickbar'>";
 
@@ -193,7 +218,10 @@ class SkinCologneBlue extends Skin {
                        $s .= $this->menuHead( 'qbedit' );
                        $s .= '<strong>' . $this->editThisPage() . '</strong>';
 
-                       $s .= $sep . $this->makeKnownLink( wfMsgForContent( 'edithelppage' ), wfMsg( 'edithelp' ) );
+                       $s .= $sep . $this->linkKnown(
+                               Title::newFromText( wfMsgForContent( 'edithelppage' ) ),
+                               wfMsg( 'edithelp' )
+                       );
 
                        if( $wgUser->isLoggedIn() ) {
                                $s .= $sep . $this->moveThisPage();
@@ -228,7 +256,7 @@ class SkinCologneBlue extends Skin {
                          . $sep . $this->watchPageLinksLink();
 
                        if( $tns == NS_USER || $tns == NS_USER_TALK ) {
-                               $id = User::idFromName( $wgOut->getTitle()->getText() );
+                               $id = User::idFromName( $this->mTitle->getText() );
                                if( $id != 0 ) {
                                        $s .= $sep . $this->userContribsLink();
                                        if( $this->showEmailUser( $id ) ) {
@@ -242,20 +270,35 @@ class SkinCologneBlue extends Skin {
                $s .= $this->menuHead( 'qbmyoptions' );
                if ( $wgUser->isLoggedIn() ) {
                        $name = $wgUser->getName();
-                       $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
-                               wfMsg( 'mytalk' ) );
+                       $tl = $this->link(
+                               $wgUser->getTalkPage(),
+                               wfMsg( 'mytalk' ),
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       );
                        if ( $wgUser->getNewtalk() ) {
                                $tl .= " *";
                        }
 
-                       $s .= $this->makeKnownLinkObj( $wgUser->getUserPage(),
-                               wfMsg( 'mypage' ) )
+                       $s .= $this->link(
+                               $wgUser->getUserPage(),
+                               wfMsg( 'mypage' ),
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                         )
                          . $sep . $tl
                          . $sep . $this->specialLink( 'watchlist' )
-                         . $sep . $this->makeKnownLinkObj( SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
-                               wfMsg( 'mycontris' ) )
-                         . $sep . $this->specialLink( 'preferences' )
-                         . $sep . $this->specialLink( 'userlogout' );
+                         . $sep . $this->link(
+                               SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
+                               wfMsg( 'mycontris' ),
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                         )
+                         . $sep . $this->specialLink( 'preferences' )
+                         . $sep . $this->specialLink( 'userlogout' );
                } else {
                        $s .= $this->specialLink( 'userlogin' );
                }
@@ -267,15 +310,21 @@ class SkinCologneBlue extends Skin {
                if ( $wgUser->isLoggedIn() && $wgEnableUploads ) {
                        $s .= $sep . $this->specialLink( 'upload' );
                }
+
                global $wgSiteSupportPage;
+
                if( $wgSiteSupportPage ) {
                        $s .= $sep . '<a href="' . htmlspecialchars( $wgSiteSupportPage ) . '" class="internal">'
                              . wfMsg( 'sitesupport' ) . '</a>';
                }
 
-               $s .= $sep . $this->makeKnownLinkObj(
+               $s .= $sep . $this->link(
                        SpecialPage::getTitleFor( 'Specialpages' ),
-                       wfMsg( 'moredotdotdot' ) );
+                       wfMsg( 'moredotdotdot' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
 
                $s .= $sep . "\n</div>\n";
                return $s;
@@ -312,4 +361,4 @@ class SkinCologneBlue extends Skin {
 
                return $s;
        }
-}
\ No newline at end of file
+}