Follow up r105517. Corrected the CSS.
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 5863c47..c56bd6f 100644 (file)
@@ -139,7 +139,7 @@ class SkinTemplate extends Skin {
                global $wgDisableCounters, $wgSitename, $wgLogo, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
-               global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
+               global $wgUseSiteJs, $wgDebugComments;
                global $wgArticlePath, $wgScriptPath, $wgServer;
 
                wfProfileIn( __METHOD__ );
@@ -175,6 +175,7 @@ class SkinTemplate extends Skin {
                $this->thisquery = wfArrayToCGI( $query );
                $this->loggedin = $user->isLoggedIn();
                $this->username = $user->getName();
+               $this->userdisplayname = $user->getDisplayName();
 
                if ( $user->isLoggedIn() || $this->showIPinHeader() ) {
                        $this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
@@ -214,13 +215,6 @@ class SkinTemplate extends Skin {
                        $tpl->set( 'html5version', $wgHtml5Version );
                        $tpl->set( 'headlinks', $out->getHeadLinks() );
                        $tpl->set( 'csslinks', $out->buildCssLinks() );
-
-                       if( $wgUseTrackbacks && $out->isArticleRelated() ) {
-                               $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() );
-                       } else {
-                               $tpl->set( 'trackbackhtml', null );
-                       }
-
                        $tpl->set( 'pageclass', $this->getPageClasses( $this->getTitle() ) );
                        $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
                }
@@ -256,7 +250,7 @@ class SkinTemplate extends Skin {
                        $feeds = array();
                        foreach( $out->getSyndicationLinks() as $format => $link ) {
                                $feeds[$format] = array(
-                                       'text' => wfMsg( "feed-$format" ),
+                                       'text' => $this->msg( "feed-$format" )->text(),
                                        'href' => $link
                                );
                        }
@@ -275,13 +269,13 @@ class SkinTemplate extends Skin {
                $tpl->set( 'printable', $out->isPrintable() );
                $tpl->set( 'handheld', $request->getBool( 'handheld' ) );
                $tpl->setRef( 'loggedin', $this->loggedin );
-               $tpl->set( 'notspecialpage', $this->getTitle()->getNamespace() != NS_SPECIAL );
+               $tpl->set( 'notspecialpage', !$this->getTitle()->isSpecialPage() );
                /* XXX currently unused, might get useful later
-               $tpl->set( 'editable', ( $this->getTitle()->getNamespace() != NS_SPECIAL ) );
+               $tpl->set( 'editable', ( !$this->getTitle()->isSpecialPage() ) );
                $tpl->set( 'exists', $this->getTitle()->getArticleID() != 0 );
                $tpl->set( 'watch', $this->getTitle()->userIsWatching() ? 'unwatch' : 'watch' );
                $tpl->set( 'protect', count( $this->getTitle()->isProtected() ) ? 'unprotect' : 'protect' );
-               $tpl->set( 'helppage', wfMsg( 'helppage' ) );
+               $tpl->set( 'helppage', $this->msg( 'helppage' )->text() );
                */
                $tpl->set( 'searchaction', $this->escapeSearchLink() );
                $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBKey() );
@@ -295,16 +289,17 @@ class SkinTemplate extends Skin {
 
                $contentlang = $wgContLang->getCode();
                $contentdir  = $wgContLang->getDir();
-               $userlang = $this->getLang()->getCode();
-               $userdir  = $this->getLang()->getDir();
+               $userlang = $this->getLanguage()->getCode();
+               $userdir  = $this->getLanguage()->getDir();
 
                $tpl->set( 'lang', $userlang );
                $tpl->set( 'dir', $userdir );
-               $tpl->set( 'rtl', $this->getLang()->isRTL() );
+               $tpl->set( 'rtl', $this->getLanguage()->isRTL() );
 
-               $tpl->set( 'capitalizeallnouns', $this->getLang()->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
+               $tpl->set( 'capitalizeallnouns', $this->getLanguage()->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
                $tpl->set( 'showjumplinks', $user->getOption( 'showjumplinks' ) );
                $tpl->set( 'username', $user->isAnon() ? null : $this->username );
+               $tpl->set( 'userdisplayname', $user->isAnon() ? null : $this->userdisplayname );
                $tpl->setRef( 'userpage', $this->userpage );
                $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
                $tpl->set( 'userlang', $userlang );
@@ -334,11 +329,11 @@ class SkinTemplate extends Skin {
                $tpl->set( 'numberofwatchingusers', false );
                if ( $out->isArticle() && $this->getTitle()->exists() ) {
                        if ( $this->isRevisionCurrent() ) {
-                               $article = new Article( $this->getTitle(), 0 );
+                               $page = WikiPage::factory( $this->getTitle() );
                                if ( !$wgDisableCounters ) {
-                                       $viewcount = $this->getLang()->formatNum( $article->getCount() );
+                                       $viewcount = $page->getCount();
                                        if ( $viewcount ) {
-                                               $tpl->set( 'viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
+                                               $tpl->set( 'viewcount', $this->msg( 'viewcount' )->numParams( $viewcount )->parse() );
                                        }
                                }
 
@@ -350,16 +345,15 @@ class SkinTemplate extends Skin {
                                        );
                                        if( $num > 0 ) {
                                                $tpl->set( 'numberofwatchingusers',
-                                                       wfMsgExt( 'number_of_watching_users_pageview', array( 'parseinline' ),
-                                                       $this->getLang()->formatNum( $num ) )
+                                                       $this->msg( 'number_of_watching_users_pageview' )->numParams( $num )->parse()
                                                );
                                        }
                                }
 
                                if ( $wgMaxCredits != 0 ) {
-                                       $tpl->set( 'credits', Action::factory( 'credits', $article )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) );
+                                       $tpl->set( 'credits', Action::factory( 'credits', $page, $this->getContext() )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) );
                                } else {
-                                       $tpl->set( 'lastmod', $this->lastModified( $article ) );
+                                       $tpl->set( 'lastmod', $this->lastModified( $page ) );
                                }
                        }
                        $tpl->set( 'copyright', $this->getCopyright() );
@@ -447,7 +441,9 @@ class SkinTemplate extends Skin {
                                                'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
                                                                        $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
                                                'title' => $nt->getText(),
-                                               'class' => $class
+                                               'class' => $class,
+                                               'lang' => $nt->getInterwiki(),
+                                               'hreflang' => $nt->getInterwiki(),
                                        );
                                }
                        }
@@ -550,36 +546,44 @@ class SkinTemplate extends Skin {
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
 
-               $page = $request->getVal( 'returnto', $this->thispage );
-               $query = $request->getVal( 'returntoquery', $this->thisquery );
-               $a = array( 'returnto' => $page );
-               if( $query != '' ) {
-                       $a['returntoquery'] = $query;
+               # Due to bug 32276, if a user does not have read permissions, 
+               # $this->getTitle() will just give Special:Badtitle, which is 
+               # not especially useful as a returnto parameter. Use the title 
+               # from the request instead, if there was one.
+               $page = Title::newFromURL( $request->getVal( 'title', '' ) );
+               $page = $request->getVal( 'returnto', $page );
+               $a = array();
+               if ( strval( $page ) !== '' ) {
+                       $a['returnto'] = $page;
+                       $query = $request->getVal( 'returntoquery', $this->thisquery );
+                       if( $query != '' ) {
+                               $a['returntoquery'] = $query;
+                       }
                }
                $returnto = wfArrayToCGI( $a );
                if( $this->loggedin ) {
                        $personal_urls['userpage'] = array(
-                               'text' => $this->username,
+                               'text' => $this->userdisplayname,
                                'href' => &$this->userpageUrlDetails['href'],
                                'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
                                'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
                        );
                        $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
                        $personal_urls['mytalk'] = array(
-                               'text' => wfMsg( 'mytalk' ),
+                               'text' => $this->msg( 'mytalk' )->text(),
                                'href' => &$usertalkUrlDetails['href'],
                                'class' => $usertalkUrlDetails['exists'] ? false : 'new',
                                'active' => ( $usertalkUrlDetails['href'] == $pageurl )
                        );
                        $href = self::makeSpecialUrl( 'Preferences' );
                        $personal_urls['preferences'] = array(
-                               'text' => wfMsg( 'mypreferences' ),
+                               'text' => $this->msg( 'mypreferences' )->text(),
                                'href' => $href,
                                'active' => ( $href == $pageurl )
                        );
                        $href = self::makeSpecialUrl( 'Watchlist' );
                        $personal_urls['watchlist'] = array(
-                               'text' => wfMsg( 'mywatchlist' ),
+                               'text' => $this->msg( 'mywatchlist' )->text(),
                                'href' => $href,
                                'active' => ( $href == $pageurl )
                        );
@@ -590,7 +594,7 @@ class SkinTemplate extends Skin {
                        # thickens, because $wgTitle is altered for special pages, so doesn't
                        # contain the original alias-with-subpage.
                        $origTitle = Title::newFromText( $request->getText( 'title' ) );
-                       if( $origTitle instanceof Title && $origTitle->getNamespace() == NS_SPECIAL ) {
+                       if( $origTitle instanceof Title && $origTitle->isSpecialPage() ) {
                                list( $spName, $spPar ) = SpecialPageFactory::resolveAlias( $origTitle->getText() );
                                $active = $spName == 'Contributions'
                                        && ( ( $spPar && $spPar == $this->username )
@@ -601,12 +605,12 @@ class SkinTemplate extends Skin {
 
                        $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username );
                        $personal_urls['mycontris'] = array(
-                               'text' => wfMsg( 'mycontris' ),
+                               'text' => $this->msg( 'mycontris' )->text(),
                                'href' => $href,
                                'active' => $active
                        );
                        $personal_urls['logout'] = array(
-                               'text' => wfMsg( 'userlogout' ),
+                               'text' => $this->msg( 'userlogout' )->text(),
                                'href' => self::makeSpecialUrl( 'Userlogout',
                                        // userlogout link must always contain an & character, otherwise we might not be able
                                        // to detect a buggy precaching proxy (bug 17790)
@@ -623,13 +627,13 @@ class SkinTemplate extends Skin {
 
                        # anonlogin & login are the same
                        $login_url = array(
-                               'text' => wfMsg( $loginlink ),
+                               'text' => $this->msg( $loginlink )->text(),
                                'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
                                'active' => $title->isSpecial( 'Userlogin' ) && ( $loginlink == "nav-login-createaccount" || !$is_signup )
                        );
                        if ( $this->getUser()->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) {
                                $createaccount_url = array(
-                                       'text' => wfMsg( 'createaccount' ),
+                                       'text' => $this->msg( 'createaccount' )->text(),
                                        'href' => self::makeSpecialUrl( 'Userlogin', "$returnto&type=signup" ),
                                        'active' => $title->isSpecial( 'Userlogin' ) && $is_signup
                                );
@@ -654,7 +658,7 @@ class SkinTemplate extends Skin {
                        if( $this->showIPinHeader() ) {
                                $href = &$this->userpageUrlDetails['href'];
                                $personal_urls['anonuserpage'] = array(
-                                       'text' => $this->username,
+                                       'text' => $this->userdisplayname,
                                        'href' => $href,
                                        'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
                                        'active' => ( $pageurl == $href )
@@ -662,7 +666,7 @@ class SkinTemplate extends Skin {
                                $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
                                $href = &$usertalkUrlDetails['href'];
                                $personal_urls['anontalk'] = array(
-                                       'text' => wfMsg( 'anontalk' ),
+                                       'text' => $this->msg( 'anontalk' )->text(),
                                        'href' => $href,
                                        'class' => $usertalkUrlDetails['exists'] ? false : 'new',
                                        'active' => ( $pageurl == $href )
@@ -702,7 +706,7 @@ class SkinTemplate extends Skin {
 
                // wfMessageFallback will nicely accept $message as an array of fallbacks
                // or just a single key
-               $msg = wfMessageFallback( $message );
+               $msg = wfMessageFallback( $message )->setContext( $this->getContext() );
                if ( is_array($message) ) {
                        // for hook compatibility just keep the last message name
                        $message = end($message);
@@ -786,7 +790,6 @@ class SkinTemplate extends Skin {
         * @return array
         */
        protected function buildContentNavigationUrls() {
-               global $wgContLang;
                global $wgDisableLangConversion;
 
                wfProfileIn( __METHOD__ );
@@ -807,16 +810,14 @@ class SkinTemplate extends Skin {
 
                // parameters
                $action = $request->getVal( 'action', 'view' );
-               $section = $request->getVal( 'section' );
 
-               $userCanRead = $title->userCanRead();
-               $skname = $this->skinname;
+               $userCanRead = $title->quickUserCan( 'read', $user );
 
                $preventActiveTabs = false;
                wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$preventActiveTabs ) );
 
                // Checks if page is some kind of content
-               if( $title->getNamespace() != NS_SPECIAL ) {
+               if( $title->canExist() ) {
                        // Gets page objects for the related namespaces
                        $subjectPage = $title->getSubjectPage();
                        $talkPage = $title->getTalkPage();
@@ -833,6 +834,8 @@ class SkinTemplate extends Skin {
                                $talkId = "{$subjectId}_talk";
                        }
 
+                       $skname = $this->skinname;
+
                        // Adds namespace links
                        $subjectMsg = array( "nstab-$subjectId" );
                        if ( $subjectPage->isMainPage() ) {
@@ -847,163 +850,174 @@ class SkinTemplate extends Skin {
                        );
                        $content_navigation['namespaces'][$talkId]['context'] = 'talk';
 
-                       // Adds view view link
-                       if ( $title->exists() && $userCanRead ) {
-                               $content_navigation['views']['view'] = $this->tabAction(
-                                       $isTalk ? $talkPage : $subjectPage,
-                                       array( "$skname-view-view", 'view' ),
-                                       ( $onPage && ($action == 'view' || $action == 'purge' ) ), '', true
-                               );
-                               $content_navigation['views']['view']['redundant'] = true; // signal to hide this from simple content_actions
-                       }
+                       if ( $userCanRead ) {
+                               // Adds view view link
+                               if ( $title->exists() ) {
+                                       $content_navigation['views']['view'] = $this->tabAction(
+                                               $isTalk ? $talkPage : $subjectPage,
+                                               array( "$skname-view-view", 'view' ),
+                                               ( $onPage && ($action == 'view' || $action == 'purge' ) ), '', true
+                                       );
+                                       $content_navigation['views']['view']['redundant'] = true; // signal to hide this from simple content_actions
+                               }
 
-                       wfProfileIn( __METHOD__ . '-edit' );
-
-                       // Checks if user can...
-                       if (
-                               // read and edit the current page
-                               $userCanRead && $title->quickUserCan( 'edit' ) &&
-                               (
-                                       // if it exists
-                                       $title->exists() ||
-                                       // or they can create one here
-                                       $title->quickUserCan( 'create' )
-                               )
-                       ) {
-                               // Builds CSS class for talk page links
-                               $isTalkClass = $isTalk ? ' istalk' : '';
-
-                               // Determines if we're in edit mode
-                               $selected = (
-                                       $onPage &&
-                                       ( $action == 'edit' || $action == 'submit' ) &&
-                                       ( $section != 'new' )
-                               );
-                               $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDefaultMessageText() !== false ) ?
-                                       "edit" : "create";
-                               $content_navigation['views']['edit'] = array(
-                                       'class' => ( $selected ? 'selected' : '' ) . $isTalkClass,
-                                       'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->text(),
-                                       'href' => $title->getLocalURL( $this->editUrlOptions() ),
-                                       'primary' => true, // don't collapse this in vector
-                               );
-                               // Checks if this is a current rev of talk page and we should show a new
-                               // section link
-                               if ( ( $isTalk && $this->isRevisionCurrent() ) || ( $out->showNewSectionLink() ) ) {
-                                       // Checks if we should ever show a new section link
-                                       if ( !$out->forceHideNewSectionLink() ) {
+                               wfProfileIn( __METHOD__ . '-edit' );
+
+                               // Checks if user can edit the current page if it exists or create it otherwise
+                               if ( $title->quickUserCan( 'edit', $user ) && ( $title->exists() || $title->quickUserCan( 'create', $user ) ) ) {
+                                       // Builds CSS class for talk page links
+                                       $isTalkClass = $isTalk ? ' istalk' : '';
+                                       // Whether the user is editing the page
+                                       $isEditing = $onPage && ( $action == 'edit' || $action == 'submit' );
+                                       // Whether to show the "Add a new section" tab
+                                       // Checks if this is a current rev of talk page and is not forced to be hidden
+                                       $showNewSection = !$out->forceHideNewSectionLink()
+                                               && ( ( $isTalk && $this->isRevisionCurrent() ) || $out->showNewSectionLink() );
+                                       $section = $request->getVal( 'section' );
+
+                                       $msgKey = $title->exists() || ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDefaultMessageText() !== false ) ?
+                                               "edit" : "create";
+                                       $content_navigation['views']['edit'] = array(
+                                               'class' => ( $isEditing && ( $section !== 'new' || !$showNewSection ) ? 'selected' : '' ) . $isTalkClass,
+                                               'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->setContext( $this->getContext() )->text(),
+                                               'href' => $title->getLocalURL( $this->editUrlOptions() ),
+                                               'primary' => true, // don't collapse this in vector
+                                       );
+
+                                       // section link
+                                       if ( $showNewSection ) {
                                                // Adds new section link
                                                //$content_navigation['actions']['addsection']
                                                $content_navigation['views']['addsection'] = array(
-                                                       'class' => $section == 'new' ? 'selected' : false,
-                                                       'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->text(),
+                                                       'class' => ( $isEditing && $section == 'new' ) ? 'selected' : false,
+                                                       'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->setContext( $this->getContext() )->text(),
                                                        'href' => $title->getLocalURL( 'action=edit&section=new' )
                                                );
                                        }
-                               }
-                       // Checks if the page has some kind of viewable content
-                       } elseif ( $title->hasSourceText() && $userCanRead ) {
-                               // Adds view source view link
-                               $content_navigation['views']['viewsource'] = array(
-                                       'class' => ( $onPage && $action == 'edit' ) ? 'selected' : false,
-                                       'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->text(),
-                                       'href' => $title->getLocalURL( $this->editUrlOptions() ),
-                                       'primary' => true, // don't collapse this in vector
-                               );
-                       }
-                       wfProfileOut( __METHOD__ . '-edit' );
-
-                       wfProfileIn( __METHOD__ . '-live' );
-
-                       // Checks if the page exists
-                       if ( $title->exists() && $userCanRead ) {
-                               // Adds history view link
-                               $content_navigation['views']['history'] = array(
-                                       'class' => ( $onPage && $action == 'history' ) ? 'selected' : false,
-                                       'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->text(),
-                                       'href' => $title->getLocalURL( 'action=history' ),
-                                       'rel' => 'archives',
-                               );
-
-                               if( $user->isAllowed( 'delete' ) ) {
-                                       $content_navigation['actions']['delete'] = array(
-                                               'class' => ( $onPage && $action == 'delete' ) ? 'selected' : false,
-                                               'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->text(),
-                                               'href' => $title->getLocalURL( 'action=delete' )
+                               // Checks if the page has some kind of viewable content
+                               } elseif ( $title->hasSourceText() ) {
+                                       // Adds view source view link
+                                       $content_navigation['views']['viewsource'] = array(
+                                               'class' => ( $onPage && $action == 'edit' ) ? 'selected' : false,
+                                               'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->setContext( $this->getContext() )->text(),
+                                               'href' => $title->getLocalURL( $this->editUrlOptions() ),
+                                               'primary' => true, // don't collapse this in vector
                                        );
                                }
-                               if ( $title->quickUserCan( 'move' ) ) {
-                                       $moveTitle = SpecialPage::getTitleFor( 'Movepage', $title->getPrefixedDBkey() );
-                                       $content_navigation['actions']['move'] = array(
-                                               'class' => $this->getTitle()->isSpecial( 'Movepage' ) ? 'selected' : false,
-                                               'text' => wfMessageFallback( "$skname-action-move", 'move' )->text(),
-                                               'href' => $moveTitle->getLocalURL()
+                               wfProfileOut( __METHOD__ . '-edit' );
+
+                               wfProfileIn( __METHOD__ . '-live' );
+                               // Checks if the page exists
+                               if ( $title->exists() ) {
+                                       // Adds history view link
+                                       $content_navigation['views']['history'] = array(
+                                               'class' => ( $onPage && $action == 'history' ) ? 'selected' : false,
+                                               'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->setContext( $this->getContext() )->text(),
+                                               'href' => $title->getLocalURL( 'action=history' ),
+                                               'rel' => 'archives',
                                        );
+
+                                       if ( $title->quickUserCan( 'delete', $user ) ) {
+                                               $content_navigation['actions']['delete'] = array(
+                                                       'class' => ( $onPage && $action == 'delete' ) ? 'selected' : false,
+                                                       'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->setContext( $this->getContext() )->text(),
+                                                       'href' => $title->getLocalURL( 'action=delete' )
+                                               );
+                                       }
+
+                                       if ( $title->quickUserCan( 'move', $user ) ) {
+                                               $moveTitle = SpecialPage::getTitleFor( 'Movepage', $title->getPrefixedDBkey() );
+                                               $content_navigation['actions']['move'] = array(
+                                                       'class' => $this->getTitle()->isSpecial( 'Movepage' ) ? 'selected' : false,
+                                                       'text' => wfMessageFallback( "$skname-action-move", 'move' )->setContext( $this->getContext() )->text(),
+                                                       'href' => $moveTitle->getLocalURL()
+                                               );
+                                       }
+                               } else {
+                                       // article doesn't exist or is deleted
+                                       if ( $user->isAllowed( 'deletedhistory' ) ) {
+                                               $n = $title->isDeleted();
+                                               if( $n ) {
+                                                       $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
+                                                       // If the user can't undelete but can view deleted history show them a "View .. deleted" tab instead
+                                                       $msgKey = $user->isAllowed( 'undelete' ) ? 'undelete' : 'viewdeleted';
+                                                       $content_navigation['actions']['undelete'] = array(
+                                                               'class' => $this->getTitle()->isSpecial( 'Undelete' ) ? 'selected' : false,
+                                                               'text' => wfMessageFallback( "$skname-action-$msgKey", "{$msgKey}_short" )
+                                                                       ->setContext( $this->getContext() )->numParams( $n )->text(),
+                                                               'href' => $undelTitle->getLocalURL( array( 'target' => $title->getPrefixedDBkey() ) )
+                                                       );
+                                               }
+                                       }
                                }
 
-                               if ( $title->getNamespace() !== NS_MEDIAWIKI && $user->isAllowed( 'protect' ) ) {
-                                       $mode = !$title->isProtected() ? 'protect' : 'unprotect';
+                               if ( $title->getNamespace() !== NS_MEDIAWIKI && $title->quickUserCan( 'protect', $user ) ) {
+                                       $mode = $title->isProtected() ? 'unprotect' : 'protect';
                                        $content_navigation['actions'][$mode] = array(
                                                'class' => ( $onPage && $action == $mode ) ? 'selected' : false,
-                                               'text' => wfMessageFallback( "$skname-action-$mode", $mode )->text(),
+                                               'text' => wfMessageFallback( "$skname-action-$mode", $mode )->setContext( $this->getContext() )->text(),
                                                'href' => $title->getLocalURL( "action=$mode" )
                                        );
                                }
-                       } else {
-                               // article doesn't exist or is deleted
-                               if ( $user->isAllowed( 'deletedhistory' ) && !$user->isBlocked() ) {
-                                       $includeSuppressed = $user->isAllowed( 'suppressrevision' );
-                                       $n = $title->isDeleted( $includeSuppressed );
-                                       if( $n ) {
-                                               $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
-                                               // If the user can't undelete but can view deleted history show them a "View .. deleted" tab instead
-                                               $msgKey = $user->isAllowed( 'undelete' ) ? 'undelete' : 'viewdeleted';
-                                               $content_navigation['actions']['undelete'] = array(
-                                                       'class' => $this->getTitle()->isSpecial( 'Undelete' ) ? 'selected' : false,
-                                                       'text' => wfMessageFallback( "$skname-action-$msgKey", "{$msgKey}_short" )
-                                                               ->params( $this->getLang()->formatNum( $n ) )->text(),
-                                                       'href' => $undelTitle->getLocalURL( array( 'target' => $title->getPrefixedDBkey() ) )
-                                               );
-                                       }
-                               }
 
-                               if ( $title->getNamespace() !== NS_MEDIAWIKI && $user->isAllowed( 'protect' ) ) {
-                                       $mode = !$title->getRestrictions( 'create' ) ? 'protect' : 'unprotect';
+                               wfProfileOut( __METHOD__ . '-live' );
+
+                               // Checks if the user is logged in
+                               if ( $this->loggedin ) {
+                                       /**
+                                        * The following actions use messages which, if made particular to
+                                        * the any specific skins, would break the Ajax code which makes this
+                                        * action happen entirely inline. Skin::makeGlobalVariablesScript
+                                        * defines a set of messages in a javascript object - and these
+                                        * messages are assumed to be global for all skins. Without making
+                                        * a change to that procedure these messages will have to remain as
+                                        * the global versions.
+                                        */
+                                       $mode = $title->userIsWatching() ? 'unwatch' : 'watch';
+                                       $token = WatchAction::getWatchToken( $title, $user, $mode );
                                        $content_navigation['actions'][$mode] = array(
-                                               'class' => ( $onPage && $action == $mode ) ? 'selected' : false,
-                                               'text' => wfMessageFallback( "$skname-action-$mode", $mode )->text(),
-                                               'href' => $title->getLocalURL( "action=$mode" )
+                                               'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false,
+                                               'text' => $this->msg( $mode )->text(), // uses 'watch' or 'unwatch' message
+                                               'href' => $title->getLocalURL( array( 'action' => $mode, 'token' => $token ) )
                                        );
                                }
                        }
-                       wfProfileOut( __METHOD__ . '-live' );
-
-                       // Checks if the user is logged in
-                       if ( $this->loggedin ) {
-                               /**
-                                * The following actions use messages which, if made particular to
-                                * the any specific skins, would break the Ajax code which makes this
-                                * action happen entirely inline. Skin::makeGlobalVariablesScript
-                                * defines a set of messages in a javascript object - and these
-                                * messages are assumed to be global for all skins. Without making
-                                * a change to that procedure these messages will have to remain as
-                                * the global versions.
-                                */
-                               $mode = $title->userIsWatching() ? 'unwatch' : 'watch';
-                               $token = WatchAction::getWatchToken( $title, $user, $mode );
-                               $content_navigation['actions'][$mode] = array(
-                                       'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false,
-                                       'text' => wfMsg( $mode ), // uses 'watch' or 'unwatch' message
-                                       'href' => $title->getLocalURL( array( 'action' => $mode, 'token' => $token ) )
-                               );
-                       }
 
                        wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$content_navigation ) );
+
+                       if ( $userCanRead && !$wgDisableLangConversion ) {
+                               $pageLang = $title->getPageLanguage();
+                               // Gets list of language variants
+                               $variants = $pageLang->getVariants();
+                               // Checks that language conversion is enabled and variants exist
+                               // And if it is not in the special namespace
+                               if( count( $variants ) > 1 ) {
+                                       // Gets preferred variant (note that user preference is
+                                       // only possible for wiki content language variant)
+                                       $preferred = $pageLang->getPreferredVariant();
+                                       // Loops over each variant
+                                       foreach( $variants as $code ) {
+                                               // Gets variant name from language code
+                                               $varname = $pageLang->getVariantname( $code );
+                                               // Checks if the variant is marked as disabled
+                                               if( $varname == 'disable' ) {
+                                                       // Skips this variant
+                                                       continue;
+                                               }
+                                               // Appends variant link
+                                               $content_navigation['variants'][] = array(
+                                                       'class' => ( $code == $preferred ) ? 'selected' : false,
+                                                       'text' => $varname,
+                                                       'href' => $title->getLocalURL( '', $code )
+                                               );
+                                       }
+                               }
+                       }
                } else {
                        // If it's not content, it's got to be a special page
                        $content_navigation['namespaces']['special'] = array(
                                'class' => 'selected',
-                               'text' => wfMsg( 'nstab-special' ),
+                               'text' => $this->msg( 'nstab-special' )->text(),
                                'href' => $request->getRequestURL(), // @bug 2457, 2510
                                'context' => 'subject'
                        );
@@ -1012,30 +1026,6 @@ class SkinTemplate extends Skin {
                                array( &$this, &$content_navigation ) );
                }
 
-               // Gets list of language variants
-               $variants = $wgContLang->getVariants();
-               // Checks that language conversion is enabled and variants exist
-               if( !$wgDisableLangConversion && count( $variants ) > 1 ) {
-                       // Gets preferred variant
-                       $preferred = $wgContLang->getPreferredVariant();
-                       // Loops over each variant
-                       foreach( $variants as $code ) {
-                               // Gets variant name from language code
-                               $varname = $wgContLang->getVariantname( $code );
-                               // Checks if the variant is marked as disabled
-                               if( $varname == 'disable' ) {
-                                       // Skips this variant
-                                       continue;
-                               }
-                               // Appends variant link
-                               $content_navigation['variants'][] = array(
-                                       'class' => ( $code == $preferred ) ? 'selected' : false,
-                                       'text' => $varname,
-                                       'href' => $title->getLocalURL( '', $code )
-                               );
-                       }
-               }
-
                // Equiv to SkinTemplateContentActions
                wfRunHooks( 'SkinTemplateNavigation::Universal', array( &$this,  &$content_navigation ) );
 
@@ -1133,7 +1123,6 @@ class SkinTemplate extends Skin {
         * @private
         */
        protected function buildNavUrls() {
-               global $wgUseTrackbacks;
                global $wgUploadNavigationUrl;
 
                wfProfileIn( __METHOD__ );
@@ -1152,15 +1141,21 @@ class SkinTemplate extends Skin {
                }
                $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
 
-               // default permalink to being off, will override it as required below.
+               $nav_urls['print'] = false;
                $nav_urls['permalink'] = false;
+               $nav_urls['whatlinkshere'] = false;
+               $nav_urls['recentchangeslinked'] = false;
+               $nav_urls['contributions'] = false;
+               $nav_urls['log'] = false;
+               $nav_urls['blockip'] = false;
+               $nav_urls['emailuser'] = false;
 
                // A print stylesheet is attached to all pages, but nobody ever
                // figures that out. :)  Add a link...
                if( $out->isArticle() ) {
                        if ( !$out->isPrintable() ) {
                                $nav_urls['print'] = array(
-                                       'text' => wfMsg( 'printableversion' ),
+                                       'text' => $this->msg( 'printableversion' )->text(),
                                        'href' => $this->getTitle()->getLocalURL(
                                                $request->appendQueryValue( 'printable', 'yes', true ) )
                                );
@@ -1170,7 +1165,7 @@ class SkinTemplate extends Skin {
                        $revid = $this->getRevisionId();
                        if ( $revid ) {
                                $nav_urls['permalink'] = array(
-                                       'text' => wfMsg( 'permalink' ),
+                                       'text' => $this->msg( 'permalink' )->text(),
                                        'href' => $out->getTitle()->getLocalURL( "oldid=$revid" )
                                );
                        }
@@ -1180,72 +1175,45 @@ class SkinTemplate extends Skin {
                                array( &$this, &$nav_urls, &$revid, &$revid ) );
                }
 
-               if( $this->getTitle()->getNamespace() != NS_SPECIAL ) {
-                       $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage );
+               if ( $out->isArticleRelated() ) {
                        $nav_urls['whatlinkshere'] = array(
-                               'href' => $wlhTitle->getLocalUrl()
+                               'href' => SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage )->getLocalUrl()
                        );
-                       if( $this->getTitle()->getArticleId() ) {
-                               $rclTitle = SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage );
+                       if ( $this->getTitle()->getArticleId() ) {
                                $nav_urls['recentchangeslinked'] = array(
-                                       'href' => $rclTitle->getLocalUrl()
+                                       'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalUrl()
                                );
-                       } else {
-                               $nav_urls['recentchangeslinked'] = false;
                        }
-                       if( $wgUseTrackbacks )
-                               $nav_urls['trackbacklink'] = array(
-                                       'href' => $out->getTitle()->trackbackURL()
-                               );
                }
 
                $user = $this->getRelevantUser();
                if ( $user ) {
-                       $id = $user->getID();
-                       $ip = $user->isAnon();
                        $rootUser = $user->getName();
-               } else {
-                       $id = 0;
-                       $ip = false;
-                       $rootUser = null;
-               }
 
-               if( $id || $ip ) { # both anons and non-anons have contribs list
                        $nav_urls['contributions'] = array(
                                'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
                        );
 
-                       if( $id ) {
+                       if ( $user->isLoggedIn() ) {
                                $logPage = SpecialPage::getTitleFor( 'Log' );
                                $nav_urls['log'] = array(
-                                       'href' => $logPage->getLocalUrl(
-                                               array(
-                                                       'user' => $rootUser
-                                               )
-                                       )
+                                       'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) )
                                );
-                       } else {
-                               $nav_urls['log'] = false;
                        }
 
                        if ( $this->getUser()->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
                                        'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser )
                                );
-                       } else {
-                               $nav_urls['blockip'] = false;
                        }
-               } else {
-                       $nav_urls['contributions'] = false;
-                       $nav_urls['log'] = false;
-                       $nav_urls['blockip'] = false;
-               }
-               $nav_urls['emailuser'] = false;
-               if( $this->showEmailUser( $id ) ) {
-                       $nav_urls['emailuser'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser )
-                       );
+
+                       if ( $this->showEmailUser( $user ) ) {
+                               $nav_urls['emailuser'] = array(
+                                       'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser )
+                               );
+                       }
                }
+
                wfProfileOut( __METHOD__ );
                return $nav_urls;
        }
@@ -1407,6 +1375,28 @@ abstract class QuickTemplate {
  */
 abstract class BaseTemplate extends QuickTemplate {
 
+       /**
+        * Get a Message object with its context set
+        *
+        * @param $name Str message name
+        * @return Message
+        */
+       public function getMsg( $name ) {
+               return $this->getSkin()->msg( $name );
+       }
+
+       function msg( $str ) {
+               echo $this->getMsg( $str )->escaped();
+       }
+
+       function msgHtml( $str ) {
+               echo $this->getMsg( $str )->text();
+       }
+
+       function msgWiki( $str ) {
+               echo $this->getMsg( $str )->parseAsBlock();
+       }
+
        /**
         * Create an array of common toolbox items from the data in the quicktemplate
         * stored by SkinTemplate.
@@ -1417,20 +1407,16 @@ abstract class BaseTemplate extends QuickTemplate {
                wfProfileIn( __METHOD__ );
 
                $toolbox = array();
-               if ( $this->data['notspecialpage'] ) {
+               if ( isset( $this->data['nav_urls']['whatlinkshere'] ) && $this->data['nav_urls']['whatlinkshere'] ) {
                        $toolbox['whatlinkshere'] = $this->data['nav_urls']['whatlinkshere'];
                        $toolbox['whatlinkshere']['id'] = 't-whatlinkshere';
-                       if ( $this->data['nav_urls']['recentchangeslinked'] ) {
-                               $toolbox['recentchangeslinked'] = $this->data['nav_urls']['recentchangeslinked'];
-                               $toolbox['recentchangeslinked']['msg'] = 'recentchangeslinked-toolbox';
-                               $toolbox['recentchangeslinked']['id'] = 't-recentchangeslinked';
-                       }
                }
-               if( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) {
-                       $toolbox['trackbacklink'] = $this->data['nav_urls']['trackbacklink'];
-                       $toolbox['trackbacklink']['id'] = 't-trackbacklink';
+               if ( isset( $this->data['nav_urls']['recentchangeslinked'] ) && $this->data['nav_urls']['recentchangeslinked'] ) {
+                       $toolbox['recentchangeslinked'] = $this->data['nav_urls']['recentchangeslinked'];
+                       $toolbox['recentchangeslinked']['msg'] = 'recentchangeslinked-toolbox';
+                       $toolbox['recentchangeslinked']['id'] = 't-recentchangeslinked';
                }
-               if ( $this->data['feeds'] ) {
+               if ( isset( $this->data['feeds'] ) && $this->data['feeds'] ) {
                        $toolbox['feeds']['id'] = 'feedlinks';
                        $toolbox['feeds']['links'] = array();
                        foreach ( $this->data['feeds'] as $key => $feed ) {
@@ -1442,17 +1428,17 @@ abstract class BaseTemplate extends QuickTemplate {
                        }
                }
                foreach ( array( 'contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages' ) as $special ) {
-                       if ( $this->data['nav_urls'][$special] ) {
+                       if ( isset( $this->data['nav_urls'][$special] ) && $this->data['nav_urls'][$special] ) {
                                $toolbox[$special] = $this->data['nav_urls'][$special];
                                $toolbox[$special]['id'] = "t-$special";
                        }
                }
-               if ( !empty( $this->data['nav_urls']['print']['href'] ) ) {
+               if ( isset( $this->data['nav_urls']['print'] ) && $this->data['nav_urls']['print'] ) {
                        $toolbox['print'] = $this->data['nav_urls']['print'];
                        $toolbox['print']['rel'] = 'alternate';
                        $toolbox['print']['msg'] = 'printableversion';
                }
-               if( $this->data['nav_urls']['permalink'] ) {
+               if ( isset( $this->data['nav_urls']['permalink'] ) && $this->data['nav_urls']['permalink'] ) {
                        $toolbox['permalink'] = $this->data['nav_urls']['permalink'];
                        if( $toolbox['permalink']['href'] === '' ) {
                                unset( $toolbox['permalink']['href'] );
@@ -1476,6 +1462,7 @@ abstract class BaseTemplate extends QuickTemplate {
         * This is in reality the same list as already stored in personal_urls
         * however it is reformatted so that you can just pass the individual items
         * to makeListItem instead of hardcoding the element creation boilerplate.
+        * @return array
         */
        function getPersonalTools() {
                $personal_tools = array();
@@ -1497,6 +1484,134 @@ abstract class BaseTemplate extends QuickTemplate {
                return $personal_tools;
        }
 
+       function getSidebar( $options = array() ) {
+               // Force the rendering of the following portals
+               $sidebar = $this->data['sidebar'];
+               if ( !isset( $sidebar['SEARCH'] ) ) {
+                       $sidebar['SEARCH'] = true;
+               }
+               if ( !isset( $sidebar['TOOLBOX'] ) ) {
+                       $sidebar['TOOLBOX'] = true;
+               }
+               if ( !isset( $sidebar['LANGUAGES'] ) ) {
+                       $sidebar['LANGUAGES'] = true;
+               }
+
+               if ( !isset( $options['search'] ) || $options['search'] !== true ) {
+                       unset( $sidebar['SEARCH'] );
+               }
+               if ( isset( $options['toolbox'] ) && $options['toolbox'] === false ) {
+                       unset( $sidebar['TOOLBOX'] );
+               }
+               if ( isset( $options['languages'] ) && $options['languages'] === false ) {
+                       unset( $sidebar['LANGUAGES'] );
+               }
+
+               $boxes = array();
+               foreach ( $sidebar as $boxName => $content ) {
+                       if ( $content === false ) {
+                               continue;
+                       }
+                       switch ( $boxName ) {
+                       case 'SEARCH':
+                               // Search is a special case, skins should custom implement this
+                               $boxes[$boxName] = array(
+                                       'id'        => "p-search",
+                                       'header'    => $this->getMsg( 'search' )->text(),
+                                       'generated' => false,
+                                       'content'   => true,
+                               );
+                               break;
+                       case 'TOOLBOX':
+                               $msgObj = $this->getMsg( 'toolbox' );
+                               $boxes[$boxName] = array(
+                                       'id'        => "p-tb",
+                                       'header'    => $msgObj->exists() ? $msgObj->text() : 'toolbox',
+                                       'generated' => false,
+                                       'content'   => $this->getToolbox(),
+                               );
+                               break;
+                       case 'LANGUAGES':
+                               if ( $this->data['language_urls'] ) {
+                                       $msgObj = $this->getMsg( 'otherlanguages' );
+                                       $boxes[$boxName] = array(
+                                               'id'        => "p-lang",
+                                               'header'    => $msgObj->exists() ? $msgObj->text() : 'otherlanguages',
+                                               'generated' => false,
+                                               'content'   => $this->data['language_urls'],
+                                       );
+                               }
+                               break;
+                       default:
+                               $msgObj = $this->getMsg( $boxName );
+                               $boxes[$boxName] = array(
+                                       'id'        => "p-$boxName",
+                                       'header'    => $msgObj->exists() ? $msgObj->text() : $boxName,
+                                       'generated' => true,
+                                       'content'   => $content,
+                               );
+                               break;
+                       }
+               }
+
+               // HACK: Compatibility with extensions still using SkinTemplateToolboxEnd
+               $hookContents = null;
+               if ( isset( $boxes['TOOLBOX'] ) ) {
+                       ob_start();
+                       // We pass an extra 'true' at the end so extensions using BaseTemplateToolbox
+                       // can abort and avoid outputting double toolbox links
+                       wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+                       $hookContents = ob_get_contents();
+                       ob_end_clean();
+                       if ( !trim( $hookContents ) ) {
+                               $hookContents = null;
+                       }
+               }
+               // END hack
+
+               if ( isset( $options['htmlOnly'] ) && $options['htmlOnly'] === true ) {
+                       foreach ( $boxes as $boxName => $box ) {
+                               if ( is_array( $box['content'] ) ) {
+                                       $content = "<ul>";
+                                       foreach ( $box['content'] as $key => $val ) {
+                                               $content .= "\n " . $this->makeListItem( $key, $val );
+                                       }
+                                       // HACK, shove the toolbox end onto the toolbox if we're rendering itself
+                                       if ( $hookContents ) {
+                                               $content .= "\n $hookContents";
+                                       }
+                                       // END hack
+                                       $content .= "\n</ul>\n";
+                                       $boxes[$boxName]['content'] = $content;
+                               }
+                       }
+               } else {
+                       if ( $hookContents ) {
+                               $boxes['TOOLBOXEND'] = array(
+                                       'id'        => "p-toolboxend",
+                                       'header'    => $boxes['TOOLBOX']['header'],
+                                       'generated' => false,
+                                       'content'   => "<ul>{$hookContents}</ul>",
+                               );
+                               // HACK: Make sure that TOOLBOXEND is sorted next to TOOLBOX
+                               $boxes2 = array();
+                               foreach ( $boxes as $key => $box ) {
+                                       if ( $key === 'TOOLBOXEND' ) {
+                                               continue;
+                                       }
+                                       $boxes2[$key] = $box;
+                                       if ( $key === 'TOOLBOX' ) {
+                                               $boxes2['TOOLBOXEND'] = $boxes['TOOLBOXEND'];
+                                       }
+                               }
+                               $boxes = $boxes2;
+                               // END hack
+                       }
+               }
+
+               return $boxes;
+       }
+
        /**
         * Makes a link, usually used by makeListItem to generate a link for an item
         * in a list used in navigation lists, portlets, portals, sidebars, etc...
@@ -1511,43 +1626,73 @@ abstract class BaseTemplate extends QuickTemplate {
         * If an "id" or "single-id" (if you don't want the actual id to be output on the link)
         * is present it will be used to generate a tooltip and accesskey for the link.
         * If you don't want an accesskey, set $item['tooltiponly'] = true;
+        * $options can be used to affect the output of a link:
+        *   You can use a text-wrapper key to specify a list of elements to wrap the
+        *     text of a link in. This should be an array of arrays containing a 'tag' and
+        *     optionally an 'attributes' key. If you only have one element you don't need
+        *     to wrap it in another array. eg: To use <a><span>...</span></a> in all links
+        *     use array( 'text-wrapper' => array( 'tag' => 'span' ) ) for your options.
+        *   A link-class key can be used to specify additional classes to apply to all links.
+        *   A link-fallback can be used to specify a tag to use instead of <a> if there is
+        *   no link. eg: If you specify 'link-fallback' => 'span' than any non-link will
+        *   output a <span> instead of just text.
         */
-       function makeLink( $key, $item ) {
+       function makeLink( $key, $item, $options = array() ) {
                if ( isset( $item['text'] ) ) {
                        $text = $item['text'];
                } else {
                        $text = $this->translator->translate( isset( $item['msg'] ) ? $item['msg'] : $key );
                }
 
-               if ( !isset( $item['href'] ) ) {
-                       return htmlspecialchars( $text );
-               }
+               $html = htmlspecialchars( $text );
 
-               $attrs = array();
-               foreach ( array( 'href', 'id', 'class', 'rel', 'type', 'target') as $attr ) {
-                       if ( isset( $item[$attr] ) ) {
-                               $attrs[$attr] = $item[$attr];
+               if ( isset( $options['text-wrapper'] ) ) {
+                       $wrapper = $options['text-wrapper'];
+                       if ( isset( $wrapper['tag'] ) ) {
+                               $wrapper = array( $wrapper );
+                       }
+                       while ( count( $wrapper ) > 0 ) {
+                               $element = array_pop( $wrapper );
+                               $html = Html::rawElement( $element['tag'], isset( $element['attributes'] ) ? $element['attributes'] : null, $html );
                        }
                }
 
-               if ( isset( $item['id'] ) ) {
-                       $item['single-id'] = $item['id'];
-               }
-               if ( isset( $item['single-id'] ) ) {
-                       if ( isset( $item['tooltiponly'] ) && $item['tooltiponly'] ) {
-                               $attrs['title'] = $this->getSkin()->titleAttrib( $item['single-id'] );
-                               if ( $attrs['title'] === false ) {
-                                       unset( $attrs['title'] );
+               if ( isset( $item['href'] ) || isset( $options['link-fallback'] ) ) {
+                       $attrs = $item;
+                       foreach ( array( 'single-id', 'text', 'msg', 'tooltiponly' ) as $k ) {
+                               unset( $attrs[$k] );
+                       }
+
+                       if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) {
+                               $item['single-id'] = $item['id'];
+                       }
+                       if ( isset( $item['single-id'] ) ) {
+                               if ( isset( $item['tooltiponly'] ) && $item['tooltiponly'] ) {
+                                       $title = Linker::titleAttrib( $item['single-id'] );
+                                       if ( $title !== false ) {
+                                               $attrs['title'] = $title;
+                                       }
+                               } else {
+                                       $tip = Linker::tooltipAndAccesskeyAttribs( $item['single-id'] );
+                                       if ( isset( $tip['title'] ) && $tip['title'] !== false ) {
+                                               $attrs['title'] = $tip['title'];
+                                       }
+                                       if ( isset( $tip['accesskey'] ) && $tip['accesskey'] !== false ) {
+                                               $attrs['accesskey'] = $tip['accesskey'];
+                                       }
                                }
-                       } else {
-                               $attrs = array_merge(
-                                       $attrs,
-                                       Linker::tooltipAndAccesskeyAttribs( $item['single-id'] )
-                               );
                        }
+                       if ( isset( $options['link-class'] ) ) {
+                               if ( isset( $attrs['class'] ) ) {
+                                       $attrs['class'] .= " {$options['link-class']}";
+                               } else {
+                                       $attrs['class'] = $options['link-class'];
+                               }
+                       }
+                       $html = Html::rawElement( isset( $attrs['href'] ) ? 'a' : $options['link-fallback'], $attrs, $html );
                }
 
-               return Html::element( 'a', $attrs, $text );
+               return $html;
        }
 
        /**
@@ -1568,19 +1713,19 @@ abstract class BaseTemplate extends QuickTemplate {
         * (however the link will still support a tooltip and accesskey from it)
         * If you need an id or class on a single link you should include a "links"
         * array with just one link item inside of it.
+        * $options is also passed on to makeLink calls
         */
        function makeListItem( $key, $item, $options = array() ) {
                if ( isset( $item['links'] ) ) {
                        $html = '';
                        foreach ( $item['links'] as $linkKey => $link ) {
-                               $html .= $this->makeLink( $linkKey, $link );
+                               $html .= $this->makeLink( $linkKey, $link, $options );
                        }
                } else {
-                       $link = array();
-                       foreach ( array( 'text', 'msg', 'href', 'rel', 'type', 'tooltiponly', 'target' ) as $k ) {
-                               if ( isset( $item[$k] ) ) {
-                                       $link[$k] = $item[$k];
-                               }
+                       $link = $item;
+                       // These keys are used by makeListItem and shouldn't be passed on to the link
+                       foreach ( array( 'id', 'class', 'active', 'tag' ) as $k ) {
+                               unset( $link[$k] );
                        }
                        if ( isset( $item['id'] ) ) {
                                // The id goes on the <li> not on the <a> for single links
@@ -1588,7 +1733,7 @@ abstract class BaseTemplate extends QuickTemplate {
                                // generating tooltips and accesskeys.
                                $link['single-id'] = $item['id'];
                        }
-                       $html = $this->makeLink( $key, $link );
+                       $html = $this->makeLink( $key, $link, $options );
                }
 
                $attrs = array();