Merge "(bug 25946) The message on the top of Special:RecentChanges is now displayed...
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 4636720..9807237 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Base class for template-based skins
+ * Base class for template-based skins.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -139,7 +139,7 @@ class SkinTemplate extends Skin {
                global $wgDisableCounters, $wgSitename, $wgLogo, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
-               global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
+               global $wgDebugComments;
                global $wgArticlePath, $wgScriptPath, $wgServer;
 
                wfProfileIn( __METHOD__ );
@@ -155,6 +155,7 @@ class SkinTemplate extends Skin {
                $out = $this->getOutput();
                $request = $this->getRequest();
                $user = $this->getUser();
+               $title = $this->getTitle();
 
                wfProfileIn( __METHOD__ . '-init' );
                $this->initPage( $out );
@@ -163,7 +164,8 @@ class SkinTemplate extends Skin {
                wfProfileOut( __METHOD__ . '-init' );
 
                wfProfileIn( __METHOD__ . '-stuff' );
-               $this->thispage = $this->getTitle()->getPrefixedDBkey();
+               $this->thispage = $title->getPrefixedDBkey();
+               $this->titletxt = $title->getPrefixedText();
                $this->userpage = $user->getUserPage()->getPrefixedText();
                $query = array();
                if ( !$request->wasPosted() ) {
@@ -176,7 +178,7 @@ class SkinTemplate extends Skin {
                $this->loggedin = $user->isLoggedIn();
                $this->username = $user->getName();
 
-               if ( $user->isLoggedIn() || $this->showIPinHeader() ) {
+               if ( $this->loggedin || $this->showIPinHeader() ) {
                        $this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
                } else {
                        # This won't be used in the standard skins, but we define it to preserve the interface
@@ -184,7 +186,6 @@ class SkinTemplate extends Skin {
                        $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
                }
 
-               $this->titletxt = $this->getTitle()->getPrefixedText();
                wfProfileOut( __METHOD__ . '-stuff' );
 
                wfProfileIn( __METHOD__ . '-stuff-head' );
@@ -192,36 +193,17 @@ class SkinTemplate extends Skin {
                        $tpl->set( 'pagecss', false );
                        $tpl->set( 'usercss', false );
 
-                       $this->userjs = $this->userjsprev = false;
-                       # @todo FIXME: This is the only use of OutputPage::isUserJsAllowed() anywhere; can we
-                       # get rid of it?  For that matter, why is any of this here at all?
-                       $this->setupUserJs( $out->isUserJsAllowed() );
-                       $tpl->setRef( 'userjs', $this->userjs );
-                       $tpl->setRef( 'userjsprev', $this->userjsprev );
-
-                       if( $wgUseSiteJs ) {
-                               $jsCache = $this->loggedin ? '&smaxage=0' : '';
-                               $tpl->set( 'jsvarurl',
-                                                 self::makeUrl( '-',
-                                                                               "action=raw$jsCache&gen=js&useskin=" .
-                                                                               urlencode( $this->getSkinName() ) ) );
-                       } else {
-                               $tpl->set( 'jsvarurl', false );
-                       }
+                       $tpl->set( 'userjs', false );
+                       $tpl->set( 'userjsprev', false );
+
+                       $tpl->set( 'jsvarurl', false );
 
                        $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
                        $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
                        $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( 'pageclass', $this->getPageClasses( $title ) );
                        $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
                }
                wfProfileOut( __METHOD__ . '-stuff-head' );
@@ -231,25 +213,25 @@ class SkinTemplate extends Skin {
                $tpl->set( 'pagetitle', $out->getHTMLTitle() );
                $tpl->set( 'displaytitle', $out->mPageLinkTitle );
 
-               $tpl->set( 'titleprefixeddbkey', $this->getTitle()->getPrefixedDBKey() );
-               $tpl->set( 'titletext', $this->getTitle()->getText() );
-               $tpl->set( 'articleid', $this->getTitle()->getArticleId() );
+               $tpl->setRef( 'thispage', $this->thispage );
+               $tpl->setRef( 'titleprefixeddbkey', $this->thispage );
+               $tpl->set( 'titletext', $title->getText() );
+               $tpl->set( 'articleid', $title->getArticleID() );
 
                $tpl->set( 'isarticle', $out->isArticle() );
 
-               $tpl->setRef( 'thispage', $this->thispage );
                $subpagestr = $this->subPageSubtitle();
-               $tpl->set(
-                       'subtitle', !empty( $subpagestr ) ?
-                       '<span class="subpages">' . $subpagestr . '</span>' . $out->getSubtitle() :
-                       $out->getSubtitle()
-               );
+               if ( $subpagestr !== '' ) {
+                       $subpagestr = '<span class="subpages">' . $subpagestr . '</span>';
+               }
+               $tpl->set( 'subtitle',  $subpagestr . $out->getSubtitle() );
+
                $undelete = $this->getUndeleteLink();
-               $tpl->set(
-                       'undelete', !empty( $undelete ) ?
-                       '<span class="subpages">' . $undelete . '</span>' :
-                       ''
-               );
+               if ( $undelete === '' ) {
+                       $tpl->set( 'undelete', '' );
+               } else {
+                       $tpl->set( 'undelete', '<span class="subpages">' . $undelete . '</span>' );
+               }
 
                $tpl->set( 'catlinks', $this->getCategories() );
                if( $out->isSyndicated() ) {
@@ -271,16 +253,17 @@ class SkinTemplate extends Skin {
                $tpl->setRef( 'wgScript', $wgScript );
                $tpl->setRef( 'skinname', $this->skinname );
                $tpl->set( 'skinclass', get_class( $this ) );
+               $tpl->setRef( 'skin', $this );
                $tpl->setRef( 'stylename', $this->stylename );
                $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', !$title->isSpecialPage() );
                /* XXX currently unused, might get useful later
-               $tpl->set( 'editable', ( $this->getTitle()->getNamespace() != NS_SPECIAL ) );
-               $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( 'editable', ( !$title->isSpecialPage() ) );
+               $tpl->set( 'exists', $title->getArticleID() != 0 );
+               $tpl->set( 'watch', $title->userIsWatching() ? 'unwatch' : 'watch' );
+               $tpl->set( 'protect', count( $title->isProtected() ) ? 'unprotect' : 'protect' );
                $tpl->set( 'helppage', $this->msg( 'helppage' )->text() );
                */
                $tpl->set( 'searchaction', $this->escapeSearchLink() );
@@ -293,18 +276,17 @@ class SkinTemplate extends Skin {
                $tpl->setRef( 'logopath', $wgLogo );
                $tpl->setRef( 'sitename', $wgSitename );
 
-               $contentlang = $wgContLang->getCode();
-               $contentdir  = $wgContLang->getDir();
-               $userlang = $this->getLang()->getCode();
-               $userdir  = $this->getLang()->getDir();
+               $lang = $this->getLanguage();
+               $userlang = $lang->getHtmlCode();
+               $userdir  = $lang->getDir();
 
                $tpl->set( 'lang', $userlang );
                $tpl->set( 'dir', $userdir );
-               $tpl->set( 'rtl', $this->getLang()->isRTL() );
+               $tpl->set( 'rtl', $lang->isRTL() );
 
-               $tpl->set( 'capitalizeallnouns', $this->getLang()->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
+               $tpl->set( 'capitalizeallnouns', $lang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
                $tpl->set( 'showjumplinks', $user->getOption( 'showjumplinks' ) );
-               $tpl->set( 'username', $user->isAnon() ? null : $this->username );
+               $tpl->set( 'username', $this->loggedin ? $this->username : null );
                $tpl->setRef( 'userpage', $this->userpage );
                $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
                $tpl->set( 'userlang', $userlang );
@@ -315,7 +297,7 @@ class SkinTemplate extends Skin {
                $tpl->set( 'userlangattributes', '' );
                $tpl->set( 'specialpageattributes', '' ); # obsolete
 
-               if ( $userlang !== $contentlang || $userdir !== $contentdir ) {
+               if ( $userlang !== $wgContLang->getHtmlCode() || $userdir !== $wgContLang->getDir() ) {
                        $attrs = " lang='$userlang' dir='$userdir'";
                        $tpl->set( 'userlangattributes', $attrs );
                }
@@ -324,7 +306,6 @@ class SkinTemplate extends Skin {
 
                wfProfileIn( __METHOD__ . '-stuff3' );
                $tpl->set( 'newtalk', $this->getNewtalks() );
-               $tpl->setRef( 'skin', $this );
                $tpl->set( 'logo', $this->logoText() );
 
                $tpl->set( 'copyright', false );
@@ -332,11 +313,10 @@ class SkinTemplate extends Skin {
                $tpl->set( 'lastmod', false );
                $tpl->set( 'credits', false );
                $tpl->set( 'numberofwatchingusers', false );
-               if ( $out->isArticle() && $this->getTitle()->exists() ) {
+               if ( $out->isArticle() && $title->exists() ) {
                        if ( $this->isRevisionCurrent() ) {
-                               $article = new Article( $this->getTitle(), 0 );
                                if ( !$wgDisableCounters ) {
-                                       $viewcount = $article->getCount();
+                                       $viewcount = $this->getWikiPage()->getCount();
                                        if ( $viewcount ) {
                                                $tpl->set( 'viewcount', $this->msg( 'viewcount' )->numParams( $viewcount )->parse() );
                                        }
@@ -345,7 +325,7 @@ class SkinTemplate extends Skin {
                                if( $wgPageShowWatchingUsers ) {
                                        $dbr = wfGetDB( DB_SLAVE );
                                        $num = $dbr->selectField( 'watchlist', 'COUNT(*)',
-                                               array( 'wl_title' => $this->getTitle()->getDBkey(), 'wl_namespace' => $this->getTitle()->getNamespace() ),
+                                               array( 'wl_title' => $title->getDBkey(), 'wl_namespace' => $title->getNamespace() ),
                                                __METHOD__
                                        );
                                        if( $num > 0 ) {
@@ -356,9 +336,10 @@ class SkinTemplate extends Skin {
                                }
 
                                if ( $wgMaxCredits != 0 ) {
-                                       $tpl->set( 'credits', Action::factory( 'credits', $article )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) );
+                                       $tpl->set( 'credits', Action::factory( 'credits', $this->getWikiPage(),
+                                               $this->getContext() )->getCredits( $wgMaxCredits, $wgShowCreditsIfMax ) );
                                } else {
-                                       $tpl->set( 'lastmod', $this->lastModified( $article ) );
+                                       $tpl->set( 'lastmod', $this->lastModified() );
                                }
                        }
                        $tpl->set( 'copyright', $this->getCopyright() );
@@ -412,23 +393,27 @@ class SkinTemplate extends Skin {
                        $tpl->set( 'debug', '' );
                }
 
-               $tpl->set( 'reporttime', wfReportTime() );
                $tpl->set( 'sitenotice', $this->getSiteNotice() );
                $tpl->set( 'bottomscripts', $this->bottomScripts() );
                $tpl->set( 'printfooter', $this->printSource() );
 
-               # Add a <div class="mw-content-ltr/rtl"> around the body text
+               # An ID that includes the actual body text; without categories, contentSub, ...
+               $realBodyAttribs = array( 'id' => 'mw-content-text' );
+
+               # Add a mw-content-ltr/rtl class to be able to style based on text direction
+               # when the content is different from the UI language, i.e.:
                # not for special pages or file pages AND only when viewing AND if the page exists
                # (or is in MW namespace, because that has default content)
-               if( !in_array( $this->getTitle()->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) &&
+               if( !in_array( $title->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) &&
                        in_array( $request->getVal( 'action', 'view' ), array( 'view', 'historysubmit' ) ) &&
-                       ( $this->getTitle()->exists() || $this->getTitle()->getNamespace() == NS_MEDIAWIKI ) ) {
-                       $pageLang = $this->getTitle()->getPageLanguage();
-                       $realBodyAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
-                               'class' => 'mw-content-'.$pageLang->getDir() );
-                       $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
+                       ( $title->exists() || $title->getNamespace() == NS_MEDIAWIKI ) ) {
+                       $pageLang = $title->getPageLanguage();
+                       $realBodyAttribs['lang'] = $pageLang->getHtmlCode();
+                       $realBodyAttribs['dir'] = $pageLang->getDir();
+                       $realBodyAttribs['class'] = 'mw-content-'.$pageLang->getDir();
                }
 
+               $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
                $tpl->setRef( 'bodytext', $out->mBodytext );
 
                # Language links
@@ -443,10 +428,12 @@ class SkinTemplate extends Skin {
                                if ( $nt ) {
                                        $language_urls[] = array(
                                                'href' => $nt->getFullURL(),
-                                               'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
-                                                                       $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+                                               'text' => ( Language::fetchLanguageName( $nt->getInterwiki() ) != '' ?
+                                                                       Language::fetchLanguageName( $nt->getInterwiki() ) : $l ),
                                                'title' => $nt->getText(),
-                                               'class' => $class
+                                               'class' => $class,
+                                               'lang' => $nt->getInterwiki(),
+                                               'hreflang' => $nt->getInterwiki(),
                                        );
                                }
                        }
@@ -473,10 +460,11 @@ class SkinTemplate extends Skin {
                if ( $this->useHeadElement ) {
                        $tpl->set( 'headelement', $out->headElement( $this ) );
                } else {
-                       $tpl->set( 'headscripts', $out->getScript() );
+                       $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() );
                }
 
                $tpl->set( 'debughtml', $this->generateDebugHTML() );
+               $tpl->set( 'reporttime', wfReportTime() );
 
                // original version by hansm
                if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
@@ -530,6 +518,7 @@ class SkinTemplate extends Skin {
         * This is setup as a method so that like with $wgLogo and getLogo() a skin
         * can override this setting and always output one or the other if it has
         * a reason it can't output one of the two modes.
+        * @return bool
         */
        function useCombinedLoginLink() {
                global $wgUseCombinedLoginLink;
@@ -549,11 +538,19 @@ 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 ) {
@@ -584,12 +581,14 @@ class SkinTemplate extends Skin {
                        );
 
                        # We need to do an explicit check for Special:Contributions, as we
-                       # have to match both the title, and the target (which could come
-                       # from request values or be specified in "sub page" form. The plot
-                       # thickens, because $wgTitle is altered for special pages, so doesn't
-                       # contain the original alias-with-subpage.
+                       # have to match both the title, and the target, which could come
+                       # from request values (Special:Contributions?target=Jimbo_Wales)
+                       # or be specified in "sub page" form
+                       # (Special:Contributions/Jimbo_Wales). The plot
+                       # thickens, because the Title object is altered for special pages,
+                       # so it 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 )
@@ -805,16 +804,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();
@@ -831,6 +828,8 @@ class SkinTemplate extends Skin {
                                $talkId = "{$subjectId}_talk";
                        }
 
+                       $skname = $this->skinname;
+
                        // Adds namespace links
                        $subjectMsg = array( "nstab-$subjectId" );
                        if ( $subjectPage->isMainPage() ) {
@@ -845,157 +844,171 @@ 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 )->setContext( $this->getContext() )->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,
+                                                       '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' )->setContext( $this->getContext() )->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' )->setContext( $this->getContext() )->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' )->setContext( $this->getContext() )->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' )->setContext( $this->getContext() )->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 )->setContext( $this->getContext() )->text(),
                                                'href' => $title->getLocalURL( "action=$mode" )
                                        );
                                }
-                       } 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->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 )->setContext( $this->getContext() )->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' => $this->msg( $mode )->text(), // 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( array( 'variant' => $code ) ),
+                                                       'lang' => $code,
+                                                       'hreflang' => $code
+                                               );
+                                       }
+                               }
+                       }
                } else {
                        // If it's not content, it's got to be a special page
                        $content_navigation['namespaces']['special'] = array(
@@ -1009,35 +1022,6 @@ class SkinTemplate extends Skin {
                                array( &$this, &$content_navigation ) );
                }
 
-               if ( !$wgDisableLangConversion && $title->getNamespace() != NS_SPECIAL ) {
-                       $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 )
-                                       );
-                               }
-                       }
-               }
-
                // Equiv to SkinTemplateContentActions
                wfRunHooks( 'SkinTemplateNavigation::Universal', array( &$this,  &$content_navigation ) );
 
@@ -1135,7 +1119,6 @@ class SkinTemplate extends Skin {
         * @private
         */
        protected function buildNavUrls() {
-               global $wgUseTrackbacks;
                global $wgUploadNavigationUrl;
 
                wfProfileIn( __METHOD__ );
@@ -1154,8 +1137,14 @@ 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...
@@ -1182,72 +1171,43 @@ 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 ) {
-                               $logPage = SpecialPage::getTitleFor( 'Log' );
-                               $nav_urls['log'] = array(
-                                       'href' => $logPage->getLocalUrl(
-                                               array(
-                                                       'user' => $rootUser
-                                               )
-                                       )
-                               );
-                       } else {
-                               $nav_urls['log'] = false;
-                       }
+                       $logPage = SpecialPage::getTitleFor( 'Log' );
+                       $nav_urls['log'] = array(
+                               'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) )
+                       );
 
                        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;
        }
@@ -1261,25 +1221,6 @@ class SkinTemplate extends Skin {
                return $this->getTitle()->getNamespaceKey();
        }
 
-       /**
-        * @private
-        * @todo FIXME: Why is this duplicated in/from OutputPage::getHeadScripts()??
-        */
-       function setupUserJs( $allowUserJs ) {
-               global $wgJsMimeType;
-               wfProfileIn( __METHOD__ );
-
-               if( $allowUserJs && $this->loggedin ) {
-                       if( $this->getTitle()->isJsSubpage() and $this->getOutput()->userCanPreview() ) {
-                               # XXX: additional security check/prompt?
-                               $this->userjsprev = '/*<![CDATA[*/ ' . $this->getRequest()->getText( 'wpTextbox1' ) . ' /*]]>*/';
-                       } else {
-                               $this->userjs = self::makeUrl( $this->userpage . '/' . $this->skinname . '.js', 'action=raw&ctype=' . $wgJsMimeType );
-                       }
-               }
-               wfProfileOut( __METHOD__ );
-       }
-
        public function commonPrintStylesheet() {
                return false;
        }
@@ -1377,6 +1318,7 @@ abstract class QuickTemplate {
 
        /**
         * @private
+        * @return bool
         */
        function haveData( $str ) {
                return isset( $this->data[$str] );
@@ -1412,7 +1354,7 @@ abstract class BaseTemplate extends QuickTemplate {
        /**
         * Get a Message object with its context set
         *
-        * @param $name Str message name
+        * @param $name string message name
         * @return Message
         */
        public function getMsg( $name ) {
@@ -1436,25 +1378,22 @@ abstract class BaseTemplate extends QuickTemplate {
         * stored by SkinTemplate.
         * The resulting array is built acording to a format intended to be passed
         * through makeListItem to generate the html.
+        * @return array
         */
        function getToolbox() {
                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 ) {
@@ -1466,17 +1405,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'] );
@@ -1500,6 +1439,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();
@@ -1673,6 +1613,7 @@ abstract class BaseTemplate extends QuickTemplate {
         *   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.
+        * @return string
         */
        function makeLink( $key, $item, $options = array() ) {
                if ( isset( $item['text'] ) ) {
@@ -1751,6 +1692,7 @@ abstract class BaseTemplate extends QuickTemplate {
         * 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
+        * @return string
         */
        function makeListItem( $key, $item, $options = array() ) {
                if ( isset( $item['links'] ) ) {
@@ -1845,6 +1787,7 @@ abstract class BaseTemplate extends QuickTemplate {
         * If you pass "flat" as an option then the returned array will be a flat array
         * of footer icons instead of a key/value array of footerlinks arrays broken
         * up into categories.
+        * @return array|mixed
         */
        function getFooterLinks( $option = null ) {
                $footerlinks = $this->data['footerlinks'];
@@ -1883,6 +1826,7 @@ abstract class BaseTemplate extends QuickTemplate {
         * in the list of footer icons. This is mostly useful for skins which only
         * display the text from footericons instead of the images and don't want a
         * duplicate copyright statement because footerlinks already rendered one.
+        * @return
         */
        function getFooterIcons( $option = null ) {
                // Generate additional footer icons