More function level documentation
[lhc/web/wiklou.git] / includes / Skin.php
index 15536c4..f3e5669 100644 (file)
@@ -15,17 +15,18 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  *
  * @ingroup Skins
  */
-class Skin extends Linker {
+abstract class Skin extends Linker {
        /**#@+
         * @private
         */
        var $mWatchLinkNum = 0; // Appended to end of watch link id's
-       // How many search boxes have we made?  Avoid duplicate id's.
-       protected $searchboxes = '';
        /**#@-*/
        protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
        protected $skinname = 'standard';
-       // @todo Fixme: should be protected :-\
+       /**
+        * todo Fixme: should be protected :-\
+        * @var Title
+        */
        var $mTitle = null;
        protected $mRelevantTitle = null;
        protected $mRelevantUser = null;
@@ -181,18 +182,6 @@ class Skin extends Linker {
                return $this->skinname;
        }
 
-       function qbSetting() {
-               global $wgOut, $wgUser;
-
-               if ( $wgOut->isQuickbarSuppressed() ) {
-                       return 0;
-               }
-
-               $q = $wgUser->getOption( 'quickbar', 0 );
-
-               return $q;
-       }
-
        function initPage( OutputPage $out ) {
                global $wgFavicon, $wgAppleTouchIcon, $wgEnableAPI;
 
@@ -439,6 +428,7 @@ class Skin extends Linker {
        /**
         * Outputs the HTML generated by other functions.
         * @param $out Object: instance of OutputPage
+        * @todo Exterminate!
         */
        function outputPage( OutputPage $out ) {
                global $wgDebugComments;
@@ -483,49 +473,6 @@ class Skin extends Linker {
                } 
        }
 
-       /**
-        * Make a <script> tag containing global variables
-        * @param $skinName string Name of the skin
-        * The odd calling convention is for backwards compatibility
-        * @todo FIXME: Make this not depend on $wgTitle!
-        * 
-        * Do not add things here which can be evaluated in ResourceLoaderStartupScript - in other words, without state.
-        * You will only be adding bloat to the page and causing page caches to have to be purged on configuration changes.
-        */
-       static function makeGlobalVariablesScript( $skinName ) {
-               global $wgTitle, $wgUser, $wgRequest, $wgOut, $wgUseAjax, $wgEnableMWSuggest;
-               
-               $ns = $wgTitle->getNamespace();
-               $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText();
-               $vars = array(
-                       'wgCanonicalNamespace' => $nsname,
-                       'wgCanonicalSpecialPageName' => $ns == NS_SPECIAL ?
-                               SpecialPage::resolveAlias( $wgTitle->getDBkey() ) : false, # bug 21115
-                       'wgNamespaceNumber' => $wgTitle->getNamespace(),
-                       'wgPageName' => $wgTitle->getPrefixedDBKey(),
-                       'wgTitle' => $wgTitle->getText(),
-                       'wgAction' => $wgRequest->getText( 'action', 'view' ),
-                       'wgArticleId' => $wgTitle->getArticleId(),
-                       'wgIsArticle' => $wgOut->isArticle(),
-                       'wgUserName' => $wgUser->isAnon() ? null : $wgUser->getName(),
-                       'wgUserGroups' => $wgUser->getEffectiveGroups(),
-                       'wgCurRevisionId' => $wgTitle->getLatestRevID(),
-                       'wgCategories' => $wgOut->getCategories(),
-                       'wgBreakFrames' => $wgOut->getFrameOptions() == 'DENY',
-               );
-               foreach ( $wgTitle->getRestrictionTypes() as $type ) {
-                       $vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type );
-               }
-               if ( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
-                       $vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $wgUser );
-               }
-               
-               // Allow extensions to add their custom variables to the global JS variables
-               wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
-               
-               return self::makeVariablesScript( $vars );
-       }
-
        /**
         * To make it harder for someone to slip a user a fake
         * user-JavaScript or user-CSS preview, a random token
@@ -602,7 +549,7 @@ class Skin extends Linker {
         * @private
         */
        function setupUserCss( OutputPage $out ) {
-               global $wgRequest;
+               global $wgRequest, $wgUser;
                global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs;
 
                wfProfileIn( __METHOD__ );
@@ -616,6 +563,9 @@ class Skin extends Linker {
                // Per-site custom styles
                if ( $wgUseSiteCss ) {
                        $out->addModuleStyles( 'site' );
+                       if( $wgUser->isLoggedIn() ){
+                               $out->addModuleStyles( 'user.groups' );
+                       }
                }
 
                // Per-user custom styles
@@ -656,20 +606,22 @@ class Skin extends Linker {
        /**
         * Add skin specific stylesheets
         * @param $out OutputPage
+        * @delete
         */
-       function setupSkinUserCss( OutputPage $out ) {
-               $out->addModuleStyles( 'mediawiki.legacy.shared' );
-               $out->addModuleStyles( 'mediawiki.legacy.oldshared' );
-               // TODO: When converting old skins to use ResourceLoader (or removing them) the following should be reconsidered
-               $out->addStyle( $this->getStylesheet() );
-               $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
-       }
+       abstract function setupSkinUserCss( OutputPage $out );
 
        function getPageClasses( $title ) {
                $numeric = 'ns-' . $title->getNamespace();
 
                if ( $title->getNamespace() == NS_SPECIAL ) {
                        $type = 'ns-special';
+                       // bug 23315: provide a class based on the canonical special page name without subpages
+                       list( $canonicalName ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
+                       if ( $canonicalName ) {
+                               $type .= ' ' . Sanitizer::escapeClass( "mw-special-$canonicalName" );
+                       } else {
+                               $type .= ' mw-invalidspecialpage';
+                       }
                } elseif ( $title->isTalkPage() ) {
                        $type = 'ns-talk';
                } else {
@@ -698,83 +650,6 @@ class Skin extends Linker {
                return $wgLogo;
        }
 
-       /**
-        * This will be called immediately after the <body> tag.  Split into
-        * two functions to make it easier to subclass.
-        */
-       function beforeContent() {
-               return $this->doBeforeContent();
-       }
-
-       function doBeforeContent() {
-               global $wgContLang;
-               wfProfileIn( __METHOD__ );
-
-               $s = '';
-               $qb = $this->qbSetting();
-
-               $langlinks = $this->otherLanguages();
-               if ( $langlinks ) {
-                       $rows = 2;
-                       $borderhack = '';
-               } else {
-                       $rows = 1;
-                       $langlinks = false;
-                       $borderhack = 'class="top"';
-               }
-
-               $s .= "\n<div id='content'>\n<div id='topbar'>\n" .
-                 "<table border='0' cellspacing='0' width='98%'>\n<tr>\n";
-
-               $shove = ( $qb != 0 );
-               $left = ( $qb == 1 || $qb == 3 );
-
-               if ( $wgContLang->isRTL() ) {
-                       $left = !$left;
-               }
-
-               if ( !$shove ) {
-                       $s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
-                               $this->logoText() . '</td>';
-               } elseif ( $left ) {
-                       $s .= $this->getQuickbarCompensator( $rows );
-               }
-
-               $l = $wgContLang->alignStart();
-               $s .= "<td {$borderhack} align='$l' valign='top'>\n";
-
-               $s .= $this->topLinks();
-               $s .= '<p class="subtitle">' . $this->pageTitleLinks() . "</p>\n";
-
-               $r = $wgContLang->alignEnd();
-               $s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
-               $s .= $this->nameAndLogin();
-               $s .= "\n<br />" . $this->searchForm() . '</td>';
-
-               if ( $langlinks ) {
-                       $s .= "</tr>\n<tr>\n<td class='top' colspan=\"2\">$langlinks</td>\n";
-               }
-
-               if ( $shove && !$left ) { # Right
-                       $s .= $this->getQuickbarCompensator( $rows );
-               }
-
-               $s .= "</tr>\n</table>\n</div>\n";
-               $s .= "\n<div id='article'>\n";
-
-               $notice = wfGetSiteNotice();
-
-               if ( $notice ) {
-                       $s .= "\n<div id='siteNotice'>$notice</div>\n";
-               }
-               $s .= $this->pageTitle();
-               $s .= $this->pageSubtitle();
-               $s .= $this->getCategories();
-
-               wfProfileOut( __METHOD__ );
-               return $s;
-       }
-
        function getCategoryLinks() {
                global $wgOut, $wgUseCategoryBrowser;
                global $wgContLang, $wgUser;
@@ -886,10 +761,6 @@ class Skin extends Linker {
                return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
        }
 
-       function getQuickbarCompensator( $rows = 1 ) {
-               return "<td width='152' rowspan='{$rows}'>&#160;</td>";
-       }
-
        /**
         * This runs a hook to allow extensions placing their stuff after content
         * and article metadata (e.g. categories).
@@ -981,15 +852,6 @@ class Skin extends Linker {
                return $ret;
        }
 
-       /**
-        * This gets called shortly before the </body> tag.
-        * @return String HTML to be put before </body>
-        */
-       function afterContent() {
-               $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
-               return $printfooter . $this->generateDebugHTML() . $this->doAfterContent();
-       }
-
        /**
         * This gets called shortly before the </body> tag.
         * @param $out OutputPage object
@@ -1008,94 +870,6 @@ class Skin extends Linker {
                return wfMsg( 'retrievedfrom', '<a href="' . $url . '">' . $url . '</a>' );
        }
 
-       function printFooter() {
-               return "<p>" .  $this->printSource() .
-                       "</p>\n\n<p>" . $this->pageStats() . "</p>\n";
-       }
-
-       /** overloaded by derived classes */
-       function doAfterContent() {
-               return '</div></div>';
-       }
-
-       function pageTitleLinks() {
-               global $wgOut, $wgUser, $wgRequest, $wgLang;
-
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
-               $action = $wgRequest->getText( 'action' );
-
-               $s[] = $this->printableLink();
-               $disclaimer = $this->disclaimerLink(); # may be empty
-
-               if ( $disclaimer ) {
-                       $s[] = $disclaimer;
-               }
-
-               $privacy = $this->privacyLink(); # may be empty too
-
-               if ( $privacy ) {
-                       $s[] = $privacy;
-               }
-
-               if ( $wgOut->isArticleRelated() ) {
-                       if ( $this->mTitle->getNamespace() == NS_FILE ) {
-                               $name = $this->mTitle->getDBkey();
-                               $image = wfFindFile( $this->mTitle );
-
-                               if ( $image ) {
-                                       $link = htmlspecialchars( $image->getURL() );
-                                       $style = $this->getInternalLinkAttributes( $link, $name );
-                                       $s[] = "<a href=\"{$link}\"{$style}>{$name}</a>";
-                               }
-                       }
-               }
-
-               if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-                       $s[] .= $this->link(
-                                       $this->mTitle,
-                                       wfMsg( 'currentrev' ),
-                                       array(),
-                                       array(),
-                                       array( 'known', 'noclasses' )
-                       );
-               }
-
-               if ( $wgUser->getNewtalk() ) {
-                       # do not show "You have new messages" text when we are viewing our
-                       # own talk page
-                       if ( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) {
-                               $tl = $this->link(
-                                       $wgUser->getTalkPage(),
-                                       wfMsgHtml( 'newmessageslink' ),
-                                       array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
-                               );
-
-                               $dl = $this->link(
-                                       $wgUser->getTalkPage(),
-                                       wfMsgHtml( 'newmessagesdifflink' ),
-                                       array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
-                               );
-                               $s[] = '<strong>' . wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
-                               # disable caching
-                               $wgOut->setSquidMaxage( 0 );
-                               $wgOut->enableClientCache( false );
-                       }
-               }
-
-               $undelete = $this->getUndeleteLink();
-
-               if ( !empty( $undelete ) ) {
-                       $s[] = $undelete;
-               }
-
-               return $wgLang->pipeList( $s );
-       }
-
        function getUndeleteLink() {
                global $wgUser, $wgLang, $wgRequest;
 
@@ -1128,53 +902,6 @@ class Skin extends Linker {
                return '';
        }
 
-       function printableLink() {
-               global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
-
-               $s = array();
-
-               if ( !$wgOut->isPrintable() ) {
-                       $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
-                       $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
-               }
-
-               if ( $wgOut->isSyndicated() ) {
-                       foreach ( $wgFeedClasses as $format => $class ) {
-                               $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
-                               $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
-                                               . " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>";
-                       }
-               }
-               return $wgLang->pipeList( $s );
-       }
-
-       /**
-        * Gets the h1 element with the page title.
-        * @return string
-        */
-       function pageTitle() {
-               global $wgOut;
-               $s = '<h1 class="pagetitle">' . $wgOut->getPageTitle() . '</h1>';
-               return $s;
-       }
-
-       function pageSubtitle() {
-               global $wgOut;
-
-               $sub = $wgOut->getSubtitle();
-
-               if ( $sub == '' ) {
-                       global $wgExtraSubtitle;
-                       $sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
-               }
-
-               $subpages = $this->subPageSubtitle();
-               $sub .= !empty( $subpages ) ? "</p><p class='subpages'>$subpages" : '';
-               $s = "<p class='subtitle'>{$sub}</p>\n";
-
-               return $s;
-       }
-
        function subPageSubtitle() {
                $subpages = '';
 
@@ -1236,67 +963,6 @@ class Skin extends Linker {
                return $wgShowIPinHeader && session_id() != '';
        }
 
-       function nameAndLogin() {
-               global $wgUser, $wgLang, $wgContLang;
-
-               $logoutPage = $wgContLang->specialPage( 'Userlogout' );
-
-               $ret = '';
-
-               if ( $wgUser->isAnon() ) {
-                       if ( $this->showIPinHeader() ) {
-                               $name = wfGetIP();
-
-                               $talkLink = $this->link( $wgUser->getTalkPage(),
-                                       $wgLang->getNsText( NS_TALK ) );
-
-                               $ret .= "$name ($talkLink)";
-                       } else {
-                               $ret .= wfMsg( 'notloggedin' );
-                       }
-
-                       $returnTo = $this->mTitle->getPrefixedDBkey();
-                       $query = array();
-
-                       if ( $logoutPage != $returnTo ) {
-                               $query['returnto'] = $returnTo;
-                       }
-
-                       $loginlink = $wgUser->isAllowed( 'createaccount' )
-                               ? 'nav-login-createaccount'
-                               : 'login';
-                       $ret .= "\n<br />" . $this->link(
-                               SpecialPage::getTitleFor( 'Userlogin' ),
-                               wfMsg( $loginlink ), array(), $query
-                       );
-               } else {
-                       $returnTo = $this->mTitle->getPrefixedDBkey();
-                       $talkLink = $this->link( $wgUser->getTalkPage(),
-                               $wgLang->getNsText( NS_TALK ) );
-
-                       $ret .= $this->link( $wgUser->getUserPage(),
-                               htmlspecialchars( $wgUser->getName() ) );
-                       $ret .= " ($talkLink)<br />";
-                       $ret .= $wgLang->pipeList( array(
-                               $this->link(
-                                       SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
-                                       array(), array( 'returnto' => $returnTo )
-                               ),
-                               $this->specialLink( 'Preferences' ),
-                       ) );
-               }
-
-               $ret = $wgLang->pipeList( array(
-                       $ret,
-                       $this->link(
-                               Title::newFromText( wfMsgForContent( 'helppage' ) ),
-                               wfMsg( 'help' )
-                       ),
-               ) );
-
-               return $ret;
-       }
-
        function getSearchLink() {
                $searchPage = SpecialPage::getTitleFor( 'Search' );
                return $searchPage->getLocalURL();
@@ -1306,227 +972,6 @@ class Skin extends Linker {
                return htmlspecialchars( $this->getSearchLink() );
        }
 
-       function searchForm() {
-               global $wgRequest, $wgUseTwoButtonsSearchForm;
-
-               $search = $wgRequest->getText( 'search' );
-
-               $s = '<form id="searchform' . $this->searchboxes . '" name="search" class="inline" method="post" action="'
-                 . $this->escapeSearchLink() . "\">\n"
-                 . '<input type="text" id="searchInput' . $this->searchboxes . '" name="search" size="19" value="'
-                 . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />\n"
-                 . '<input type="submit" name="go" value="' . wfMsg( 'searcharticle' ) . '" />';
-
-               if ( $wgUseTwoButtonsSearchForm ) {
-                       $s .= '&#160;<input type="submit" name="fulltext" value="' . wfMsg( 'searchbutton' ) . "\" />\n";
-               } else {
-                       $s .= ' <a href="' . $this->escapeSearchLink() . '" rel="search">' . wfMsg( 'powersearch-legend' ) . "</a>\n";
-               }
-
-               $s .= '</form>';
-
-               // Ensure unique id's for search boxes made after the first
-               $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;
-
-               return $s;
-       }
-
-       function topLinks() {
-               global $wgOut;
-
-               $s = array(
-                       $this->mainPageLink(),
-                       $this->specialLink( 'Recentchanges' )
-               );
-
-               if ( $wgOut->isArticleRelated() ) {
-                       $s[] = $this->editThisPage();
-                       $s[] = $this->historyLink();
-               }
-
-               # Many people don't like this dropdown box
-               # $s[] = $this->specialPagesList();
-
-               if ( $this->variantLinks() ) {
-                       $s[] = $this->variantLinks();
-               }
-
-               if ( $this->extensionTabLinks() ) {
-                       $s[] = $this->extensionTabLinks();
-               }
-
-               // @todo FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline
-               return implode( $s, wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n" );
-       }
-
-       /**
-        * Compatibility for extensions adding functionality through tabs.
-        * Eventually these old skins should be replaced with SkinTemplate-based
-        * versions, sigh...
-        * @return string
-        */
-       function extensionTabLinks() {
-               $tabs = array();
-               $out = '';
-               $s = array();
-               wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
-               foreach ( $tabs as $tab ) {
-                       $s[] = Xml::element( 'a',
-                               array( 'href' => $tab['href'] ),
-                               $tab['text'] );
-               }
-
-               if ( count( $s ) ) {
-                       global $wgLang;
-
-                       $out = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
-                       $out .= $wgLang->pipeList( $s );
-               }
-
-               return $out;
-       }
-
-       /**
-        * Language/charset variant links for classic-style skins
-        * @return string
-        */
-       function variantLinks() {
-               $s = '';
-
-               /* show links to different language variants */
-               global $wgDisableLangConversion, $wgLang, $wgContLang;
-
-               $variants = $wgContLang->getVariants();
-
-               if ( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
-                       foreach ( $variants as $code ) {
-                               $varname = $wgContLang->getVariantname( $code );
-
-                               if ( $varname == 'disable' ) {
-                                       continue;
-                               }
-                               $s = $wgLang->pipeList( array(
-                                       $s,
-                                       '<a href="' . $this->mTitle->escapeLocalURL( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
-                               ) );
-                       }
-               }
-
-               return $s;
-       }
-
-       function bottomLinks() {
-               global $wgOut, $wgUser, $wgUseTrackbacks;
-               $sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n";
-
-               $s = '';
-               if ( $wgOut->isArticleRelated() ) {
-                       $element[] = '<strong>' . $this->editThisPage() . '</strong>';
-
-                       if ( $wgUser->isLoggedIn() ) {
-                               $element[] = $this->watchThisPage();
-                       }
-
-                       $element[] = $this->talkLink();
-                       $element[] = $this->historyLink();
-                       $element[] = $this->whatLinksHere();
-                       $element[] = $this->watchPageLinksLink();
-
-                       if ( $wgUseTrackbacks ) {
-                               $element[] = $this->trackbackLink();
-                       }
-
-                       if (
-                               $this->mTitle->getNamespace() == NS_USER ||
-                               $this->mTitle->getNamespace() == NS_USER_TALK
-                       ) {
-                               $id = User::idFromName( $this->mTitle->getText() );
-                               $ip = User::isIP( $this->mTitle->getText() );
-
-                               # Both anons and non-anons have contributions list
-                               if ( $id || $ip ) {
-                                       $element[] = $this->userContribsLink();
-                               }
-
-                               if ( $this->showEmailUser( $id ) ) {
-                                       $element[] = $this->emailUserLink();
-                               }
-                       }
-
-                       $s = implode( $element, $sep );
-
-                       if ( $this->mTitle->getArticleId() ) {
-                               $s .= "\n<br />";
-
-                               // Delete/protect/move links for privileged users
-                               if ( $wgUser->isAllowed( 'delete' ) ) {
-                                       $s .= $this->deleteThisPage();
-                               }
-
-                               if ( $wgUser->isAllowed( 'protect' ) ) {
-                                       $s .= $sep . $this->protectThisPage();
-                               }
-
-                               if ( $wgUser->isAllowed( 'move' ) ) {
-                                       $s .= $sep . $this->moveThisPage();
-                               }
-                       }
-
-                       $s .= "<br />\n" . $this->otherLanguages();
-               }
-
-               return $s;
-       }
-
-       function pageStats() {
-               global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
-               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgPageShowWatchingUsers;
-
-               if ( !is_null( $wgRequest->getVal( 'oldid' ) ) || !is_null( $wgRequest->getVal( 'diff' ) ) ) {
-                       return '';
-               }
-
-               if ( !$wgOut->isArticle() || !$this->mTitle->exists() ) {
-                       return '';
-               }
-
-               $s = '';
-
-               if ( !$wgDisableCounters ) {
-                       $count = $wgLang->formatNum( $wgArticle->getCount() );
-
-                       if ( $count ) {
-                               $s = wfMsgExt( 'viewcount', array( 'parseinline' ), $count );
-                       }
-               }
-
-               if ( $wgMaxCredits != 0 ) {
-                       $s .= ' ' . Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
-               } else {
-                       $s .= $this->lastModified();
-               }
-
-               if ( $wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ) ) {
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $res = $dbr->select(
-                               'watchlist',
-                               array( 'COUNT(*) AS n' ),
-                               array(
-                                       'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ),
-                                       'wl_namespace' => $this->mTitle->getNamespace()
-                               ),
-                               __METHOD__
-                       );
-                       $x = $dbr->fetchObject( $res );
-
-                       $s .= ' ' . wfMsgExt( 'number_of_watching_users_pageview',
-                               array( 'parseinline' ), $wgLang->formatNum( $x->n )
-                       );
-               }
-
-               return $s . ' ' .  $this->getCopyright();
-       }
-
        function getCopyright( $type = 'detect' ) {
                global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
 
@@ -1613,13 +1058,19 @@ class Skin extends Linker {
                return $text;
        }
 
-       function lastModified() {
-               global $wgLang, $wgArticle;
+       /**
+        * Get the timestamp of the latest revision, formatted in user language
+        *
+        * @param $article Article object. Used if we're working with the current revision
+        * @return String
+        */
+       protected function lastModified( $article ) {
+               global $wgLang;
 
                if ( !$this->isRevisionCurrent() ) {
                        $timestamp = Revision::getTimestampFromId( $this->mTitle, $this->mRevisionId );
                } else {
-                       $timestamp = $wgArticle->getTimestamp();
+                       $timestamp = $article->getTimestamp();
                }
 
                if ( $timestamp ) {
@@ -1654,40 +1105,6 @@ class Skin extends Linker {
                return $s;
        }
 
-       /**
-        * Show a drop-down box of special pages
-        */
-       function specialPagesList() {
-               global $wgContLang, $wgServer, $wgRedirectScript;
-
-               $pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
-
-               foreach ( $pages as $name => $page ) {
-                       $pages[$name] = $page->getDescription();
-               }
-
-               $go = wfMsg( 'go' );
-               $sp = wfMsg( 'specialpages' );
-               $spp = $wgContLang->specialPage( 'Specialpages' );
-
-               $s = '<form id="specialpages" method="get" ' .
-                 'action="' . htmlspecialchars( "{$wgServer}{$wgRedirectScript}" ) . "\">\n";
-               $s .= "<select name=\"wpDropdown\">\n";
-               $s .= "<option value=\"{$spp}\">{$sp}</option>\n";
-
-
-               foreach ( $pages as $name => $desc ) {
-                       $p = $wgContLang->specialPage( $name );
-                       $s .= "<option value=\"{$p}\">{$desc}</option>\n";
-               }
-
-               $s .= "</select>\n";
-               $s .= "<input type='submit' value=\"{$go}\" name='redirect' />\n";
-               $s .= "</form>\n";
-
-               return $s;
-       }
-
        /**
         * Renders a $wgFooterIcons icon acording to the method's arguments
         * @param $icon Array: The icon to build the html for, see $wgFooterIcons for the format of this array
@@ -1697,7 +1114,7 @@ class Skin extends Linker {
                if ( is_string( $icon ) ) {
                        $html = $icon;
                } else { // Assuming array
-                       $url = $icon["url"];
+                       $url = isset($icon["url"]) ? $icon["url"] : null;
                        unset( $icon["url"] );
                        if ( isset( $icon["src"] ) && $withImage === 'withImage' ) {
                                $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array
@@ -1766,32 +1183,6 @@ class Skin extends Linker {
                return $this->footerLink( 'disclaimers', 'disclaimerpage' );
        }
 
-       function editThisPage() {
-               global $wgOut;
-
-               if ( !$wgOut->isArticleRelated() ) {
-                       $s = wfMsg( 'protectedpage' );
-               } else {
-                       if ( $this->mTitle->quickUserCan( 'edit' ) && $this->mTitle->exists() ) {
-                               $t = wfMsg( 'editthispage' );
-                       } elseif ( $this->mTitle->quickUserCan( 'create' ) && !$this->mTitle->exists() ) {
-                               $t = wfMsg( 'create-this-page' );
-                       } else {
-                               $t = wfMsg( 'viewsource' );
-                       }
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $t,
-                               array(),
-                               $this->editUrlOptions(),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-
-               return $s;
-       }
-
        /**
         * Return URL options for the 'edit page' link.
         * This may include an 'oldid' specifier, if the current page view is such.
@@ -1809,129 +1200,6 @@ class Skin extends Linker {
                return $options;
        }
 
-       function deleteThisPage() {
-               global $wgUser, $wgRequest;
-
-               $diff = $wgRequest->getVal( 'diff' );
-
-               if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
-                       $t = wfMsg( 'deletethispage' );
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $t,
-                               array(),
-                               array( 'action' => 'delete' ),
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $s = '';
-               }
-
-               return $s;
-       }
-
-       function protectThisPage() {
-               global $wgUser, $wgRequest;
-
-               $diff = $wgRequest->getVal( 'diff' );
-
-               if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) {
-                       if ( $this->mTitle->isProtected() ) {
-                               $text = wfMsg( 'unprotectthispage' );
-                               $query = array( 'action' => 'unprotect' );
-                       } else {
-                               $text = wfMsg( 'protectthispage' );
-                               $query = array( 'action' => 'protect' );
-                       }
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $text,
-                               array(),
-                               $query,
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $s = '';
-               }
-
-               return $s;
-       }
-
-       function watchThisPage() {
-               global $wgOut;
-               ++$this->mWatchLinkNum;
-
-               if ( $wgOut->isArticleRelated() ) {
-                       if ( $this->mTitle->userIsWatching() ) {
-                               $text = wfMsg( 'unwatchthispage' );
-                               $query = array( 'action' => 'unwatch' );
-                               $id = 'mw-unwatch-link' . $this->mWatchLinkNum;
-                       } else {
-                               $text = wfMsg( 'watchthispage' );
-                               $query = array( 'action' => 'watch' );
-                               $id = 'mw-watch-link' . $this->mWatchLinkNum;
-                       }
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $text,
-                               array( 'id' => $id ),
-                               $query,
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $s = wfMsg( 'notanarticle' );
-               }
-
-               return $s;
-       }
-
-       function moveThisPage() {
-               if ( $this->mTitle->quickUserCan( 'move' ) ) {
-                       return $this->link(
-                               SpecialPage::getTitleFor( 'Movepage' ),
-                               wfMsg( 'movethispage' ),
-                               array(),
-                               array( 'target' => $this->mTitle->getPrefixedDBkey() ),
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       // no message if page is protected - would be redundant
-                       return '';
-               }
-       }
-
-       function historyLink() {
-               return $this->link(
-                       $this->mTitle,
-                       wfMsgHtml( 'history' ),
-                       array( 'rel' => 'archives' ),
-                       array( 'action' => 'history' )
-               );
-       }
-
-       function whatLinksHere() {
-               return $this->link(
-                       SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
-                       wfMsgHtml( 'whatlinkshere' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
-       function userContribsLink() {
-               return $this->link(
-                       SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
-                       wfMsgHtml( 'contributions' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
        function showEmailUser( $id ) {
                global $wgUser;
                $targetUser = User::newFromId( $id );
@@ -1939,182 +1207,6 @@ class Skin extends Linker {
                        $targetUser->canReceiveEmail(); # the target user must have a confirmed email address and allow emails from users
        }
 
-       function emailUserLink() {
-               return $this->link(
-                       SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
-                       wfMsg( 'emailuser' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
-       function watchPageLinksLink() {
-               global $wgOut;
-
-               if ( !$wgOut->isArticleRelated() ) {
-                       return '(' . wfMsg( 'notanarticle' ) . ')';
-               } else {
-                       return $this->link(
-                               SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
-                               wfMsg( 'recentchangeslinked-toolbox' ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-       }
-
-       function trackbackLink() {
-               return '<a href="' . $this->mTitle->trackbackURL() . '">'
-                       . wfMsg( 'trackbacklink' ) . '</a>';
-       }
-
-       function otherLanguages() {
-               global $wgOut, $wgContLang, $wgHideInterlanguageLinks;
-
-               if ( $wgHideInterlanguageLinks ) {
-                       return '';
-               }
-
-               $a = $wgOut->getLanguageLinks();
-
-               if ( 0 == count( $a ) ) {
-                       return '';
-               }
-
-               $s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' );
-               $first = true;
-
-               if ( $wgContLang->isRTL() ) {
-                       $s .= '<span dir="LTR">';
-               }
-
-               foreach ( $a as $l ) {
-                       if ( !$first ) {
-                               $s .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
-                       }
-
-                       $first = false;
-
-                       $nt = Title::newFromText( $l );
-                       $url = $nt->escapeFullURL();
-                       $text = $wgContLang->getLanguageName( $nt->getInterwiki() );
-                       $title = htmlspecialchars( $nt->getText() );
-
-                       if ( $text == '' ) {
-                               $text = $l;
-                       }
-
-                       $style = $this->getExternalLinkAttributes();
-                       $s .= "<a href=\"{$url}\" title=\"{$title}\"{$style}>{$text}</a>";
-               }
-
-               if ( $wgContLang->isRTL() ) {
-                       $s .= '</span>';
-               }
-
-               return $s;
-       }
-
-       function talkLink() {
-               if ( NS_SPECIAL == $this->mTitle->getNamespace() ) {
-                       # No discussion links for special pages
-                       return '';
-               }
-
-               $linkOptions = array();
-
-               if ( $this->mTitle->isTalkPage() ) {
-                       $link = $this->mTitle->getSubjectPage();
-                       switch( $link->getNamespace() ) {
-                               case NS_MAIN:
-                                       $text = wfMsg( 'articlepage' );
-                                       break;
-                               case NS_USER:
-                                       $text = wfMsg( 'userpage' );
-                                       break;
-                               case NS_PROJECT:
-                                       $text = wfMsg( 'projectpage' );
-                                       break;
-                               case NS_FILE:
-                                       $text = wfMsg( 'imagepage' );
-                                       # Make link known if image exists, even if the desc. page doesn't.
-                                       if ( wfFindFile( $link ) )
-                                               $linkOptions[] = 'known';
-                                       break;
-                               case NS_MEDIAWIKI:
-                                       $text = wfMsg( 'mediawikipage' );
-                                       break;
-                               case NS_TEMPLATE:
-                                       $text = wfMsg( 'templatepage' );
-                                       break;
-                               case NS_HELP:
-                                       $text = wfMsg( 'viewhelppage' );
-                                       break;
-                               case NS_CATEGORY:
-                                       $text = wfMsg( 'categorypage' );
-                                       break;
-                               default:
-                                       $text = wfMsg( 'articlepage' );
-                       }
-               } else {
-                       $link = $this->mTitle->getTalkPage();
-                       $text = wfMsg( 'talkpage' );
-               }
-
-               $s = $this->link( $link, $text, array(), array(), $linkOptions );
-
-               return $s;
-       }
-
-       function commentLink() {
-               global $wgOut;
-
-               if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
-                       return '';
-               }
-
-               # __NEWSECTIONLINK___ changes behaviour here
-               # If it is present, the link points to this page, otherwise
-               # it points to the talk page
-               if ( $this->mTitle->isTalkPage() ) {
-                       $title = $this->mTitle;
-               } elseif ( $wgOut->showNewSectionLink() ) {
-                       $title = $this->mTitle;
-               } else {
-                       $title = $this->mTitle->getTalkPage();
-               }
-
-               return $this->link(
-                       $title,
-                       wfMsg( 'postcomment' ),
-                       array(),
-                       array(
-                               'action' => 'edit',
-                               'section' => 'new'
-                       ),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
-       function getUploadLink() {
-               global $wgUploadNavigationUrl;
-
-               if ( $wgUploadNavigationUrl ) {
-                       # Using an empty class attribute to avoid automatic setting of "external" class
-                       return $this->makeExternalLink( $wgUploadNavigationUrl, wfMsgHtml( 'upload' ), false, null, array( 'class' => '' ) );
-               } else {
-                       return $this->link(
-                               SpecialPage::getTitleFor( 'Upload' ),
-                               wfMsgHtml( 'upload' ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-       }
-
        /**
         * Return a fully resolved style path url to images or styles stored in the common folder.
         * This method returns a url resolved using the configured skin style path
@@ -2421,4 +1513,115 @@ class Skin extends Linker {
 
                return $ntl;
        }
+
+       /**
+        * Get a cached notice
+        *
+        * @param $name String: message name, or 'default' for $wgSiteNotice
+        * @return String: HTML fragment
+        */
+       private function getCachedNotice( $name ) {
+               global $wgOut, $wgRenderHashAppend, $parserMemc;
+
+               wfProfileIn( __METHOD__ );
+
+               $needParse = false;
+
+               if( $name === 'default' ) {
+                       // special case
+                       global $wgSiteNotice;
+                       $notice = $wgSiteNotice;
+                       if( empty( $notice ) ) {
+                               wfProfileOut( __METHOD__ );
+                               return false;
+                       }
+               } else {
+                       $msg = wfMessage( $name )->inContentLanguage();
+                       if( $msg->isDisabled() ) {
+                               wfProfileOut( __METHOD__ );
+                               return false;
+                       }
+                       $notice = $msg->plain();
+               }
+
+               // Use the extra hash appender to let eg SSL variants separately cache.
+               $key = wfMemcKey( $name . $wgRenderHashAppend );
+               $cachedNotice = $parserMemc->get( $key );
+               if( is_array( $cachedNotice ) ) {
+                       if( md5( $notice ) == $cachedNotice['hash'] ) {
+                               $notice = $cachedNotice['html'];
+                       } else {
+                               $needParse = true;
+                       }
+               } else {
+                       $needParse = true;
+               }
+
+               if ( $needParse ) {
+                       if( is_object( $wgOut ) ) {
+                               $parsed = $wgOut->parse( $notice );
+                               $parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+                               $notice = $parsed;
+                       } else {
+                               wfDebug( 'wfGetCachedNotice called for ' . $name . ' with no $wgOut available' . "\n" );
+                               $notice = '';
+                       }
+               }
+
+               $notice = '<div id="localNotice">' .$notice . '</div>';
+               wfProfileOut( __METHOD__ );
+               return $notice;
+       }
+
+       /**
+        * Get a notice based on page's namespace
+        *
+        * @return String: HTML fragment
+        */
+       function getNamespaceNotice() {
+               wfProfileIn( __METHOD__ );
+
+               $key = 'namespacenotice-' . $this->mTitle->getNsText();
+               $namespaceNotice = wfGetCachedNotice( $key );
+               if ( $namespaceNotice && substr( $namespaceNotice, 0, 7 ) != '<p>&lt;' ) {
+                       $namespaceNotice = '<div id="namespacebanner">' . $namespaceNotice . '</div>';
+               } else {
+                       $namespaceNotice = '';
+               }
+
+               wfProfileOut( __METHOD__ );
+               return $namespaceNotice;
+       }
+
+       /**
+        * Get the site notice
+        *
+        * @return String: HTML fragment
+        */
+       function getSiteNotice() {
+               global $wgUser;
+
+               wfProfileIn( __METHOD__ );
+               $siteNotice = '';
+
+               if ( wfRunHooks( 'SiteNoticeBefore', array( &$siteNotice, $this ) ) ) {
+                       if ( is_object( $wgUser ) && $wgUser->isLoggedIn() ) {
+                               $siteNotice = $this->getCachedNotice( 'sitenotice' );
+                       } else {
+                               $anonNotice = $this->getCachedNotice( 'anonnotice' );
+                               if ( !$anonNotice ) {
+                                       $siteNotice = $this->getCachedNotice( 'sitenotice' );
+                               } else {
+                                       $siteNotice = $anonNotice;
+                               }
+                       }
+                       if ( !$siteNotice ) {
+                               $siteNotice = $this->getCachedNotice( 'default' );
+                       }
+               }
+
+               wfRunHooks( 'SiteNoticeAfter', array( &$siteNotice, $this ) );
+               wfProfileOut( __METHOD__ );
+               return $siteNotice;
+}
 }