Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 472 insertions, 1289 deletions

diff --git a/includes/Skin.php b/includes/Skin.php
index 01b3b4fe..a713660c 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -15,23 +15,10 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  *
  * @ingroup Skins
  */
-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.
+abstract class Skin extends ContextSource {
 	protected $skinname = 'standard';
-	// @todo Fixme: should be protected :-\
-	var $mTitle = null;
-
-	/** Constructor, call parent constructor */
-	function __construct() {
-		parent::__construct();
-	}
+	protected $mRelevantTitle = null;
+	protected $mRelevantUser = null;
 
 	/**
 	 * Fetch the set of available skins.
@@ -41,7 +28,7 @@ class Skin extends Linker {
 		global $wgValidSkinNames;
 		static $skinsInitialised = false;
 
-		if ( !$skinsInitialised ) {
+		if ( !$skinsInitialised || !count( $wgValidSkinNames ) ) {
 			# Get a list of available skins
 			# Build using the regular expression '^(.*).php$'
 			# Array keys are all lower case, array value keep the case used by filename
@@ -123,7 +110,7 @@ class Skin extends Linker {
 
 		if ( isset( $skinNames[$key] ) ) {
 			return $key;
-		} else if ( isset( $skinNames[$wgDefaultSkin] ) ) {
+		} elseif ( isset( $skinNames[$wgDefaultSkin] ) ) {
 			return $wgDefaultSkin;
 		} else {
 			return 'vector';
@@ -142,27 +129,31 @@ class Skin extends Linker {
 
 		$skinNames = Skin::getSkinNames();
 		$skinName = $skinNames[$key];
-		$className = 'Skin' . ucfirst( $key );
+		$className = "Skin{$skinName}";
 
 		# Grab the skin class and initialise it.
-		if ( !class_exists( $className ) ) {
-			// Preload base classes to work around APC/PHP5 bug
-			$deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
+		if ( !MWInit::classExists( $className ) ) {
 
-			if ( file_exists( $deps ) ) {
-				include_once( $deps );
+			if ( !defined( 'MW_COMPILED' ) ) {
+				// Preload base classes to work around APC/PHP5 bug
+				$deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
+				if ( file_exists( $deps ) ) {
+					include_once( $deps );
+				}
+				require_once( "{$wgStyleDirectory}/{$skinName}.php" );
 			}
-			require_once( "{$wgStyleDirectory}/{$skinName}.php" );
 
 			# Check if we got if not failback to default skin
-			if ( !class_exists( $className ) ) {
+			if ( !MWInit::classExists( $className ) ) {
 				# DO NOT die if the class isn't found. This breaks maintenance
 				# scripts and can cause a user account to be unrecoverable
 				# except by SQL manipulation if a previously valid skin name
 				# is no longer valid.
 				wfDebug( "Skin class does not exist: $className\n" );
 				$className = 'SkinVector';
-				require_once( "{$wgStyleDirectory}/Vector.php" );
+				if ( !defined( 'MW_COMPILED' ) ) {
+					require_once( "{$wgStyleDirectory}/Vector.php" );
+				}
 			}
 		}
 		$skin = new $className;
@@ -179,60 +170,11 @@ 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;
-
 		wfProfileIn( __METHOD__ );
 
-		# Generally the order of the favicon and apple-touch-icon links
-		# should not matter, but Konqueror (3.5.9 at least) incorrectly
-		# uses whichever one appears later in the HTML source. Make sure
-		# apple-touch-icon is specified first to avoid this.
-		if ( false !== $wgAppleTouchIcon ) {
-			$out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
-		}
-
-		if ( false !== $wgFavicon ) {
-			$out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
-		}
-
-		# OpenSearch description link
-		$out->addLink( array(
-			'rel' => 'search',
-			'type' => 'application/opensearchdescription+xml',
-			'href' => wfScript( 'opensearch_desc' ),
-			'title' => wfMsgForContent( 'opensearch-desc' ),
-		) );
-
-		if ( $wgEnableAPI ) {
-			# Real Simple Discovery link, provides auto-discovery information
-			# for the MediaWiki API (and potentially additional custom API
-			# support such as WordPress or Twitter-compatible APIs for a
-			# blogging extension, etc)
-			$out->addLink( array(
-				'rel' => 'EditURI',
-				'type' => 'application/rsd+xml',
-				'href' => wfExpandUrl( wfAppendQuery( wfScript( 'api' ), array( 'action' => 'rsd' ) ) ),
-			) );
-		}
-
-		$this->addMetadataLinks( $out );
-
-		$this->mRevisionId = $out->mRevisionId;
-
 		$this->preloadExistence();
+		$this->setMembers();
 
 		wfProfileOut( __METHOD__ );
 	}
@@ -241,18 +183,18 @@ class Skin extends Linker {
 	 * Preload the existence of three commonly-requested pages in a single query
 	 */
 	function preloadExistence() {
-		global $wgUser;
+		$user = $this->getUser();
 
 		// User/talk link
-		$titles = array( $wgUser->getUserPage(), $wgUser->getTalkPage() );
+		$titles = array( $user->getUserPage(), $user->getTalkPage() );
 
 		// Other tab link
-		if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
+		if ( $this->getTitle()->getNamespace() == NS_SPECIAL ) {
 			// nothing
-		} elseif ( $this->mTitle->isTalkPage() ) {
-			$titles[] = $this->mTitle->getSubjectPage();
+		} elseif ( $this->getTitle()->isTalkPage() ) {
+			$titles[] = $this->getTitle()->getSubjectPage();
 		} else {
-			$titles[] = $this->mTitle->getTalkPage();
+			$titles[] = $this->getTitle()->getTalkPage();
 		}
 
 		$lb = new LinkBatch( $titles );
@@ -261,147 +203,100 @@ class Skin extends Linker {
 	}
 
 	/**
-	 * Adds metadata links below to the HTML output.
-	 * <ol>
-	 *  <li>Creative Commons
-	 *   <br />See http://wiki.creativecommons.org/Extend_Metadata.
-	 *  </li>
-	 *  <li>Dublin Core</li>
-	 *  <li>Use hreflang to specify canonical and alternate links
-	 *   <br />See http://www.google.com/support/webmasters/bin/answer.py?answer=189077
-	 *  </li>
-	 *  <li>Copyright</li>
-	 * <ol>
-	 * 
-	 * @param $out Object: instance of OutputPage
+	 * Set some local variables
 	 */
-	function addMetadataLinks( OutputPage $out ) {
-		global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
-		global $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang;
-		global $wgRightsPage, $wgRightsUrl;
-
-		if ( $out->isArticleRelated() ) {
-			# note: buggy CC software only reads first "meta" link
-			if ( $wgEnableCreativeCommonsRdf ) {
-				$out->addMetadataLink( array(
-					'title' => 'Creative Commons',
-					'type' => 'application/rdf+xml',
-					'href' => $this->mTitle->getLocalURL( 'action=creativecommons' ) )
-				);
-			}
-
-			if ( $wgEnableDublinCoreRdf ) {
-				$out->addMetadataLink( array(
-					'title' => 'Dublin Core',
-					'type' => 'application/rdf+xml',
-					'href' => $this->mTitle->getLocalURL( 'action=dublincore' ) )
-				);
-			}
-		}
-
-		if ( !$wgDisableLangConversion && $wgCanonicalLanguageLinks
-			&& $wgContLang->hasVariants() ) {
-
-			$urlvar = $wgContLang->getURLVariant();
-
-			if ( !$urlvar ) {
-				$variants = $wgContLang->getVariants();
-				foreach ( $variants as $_v ) {
-					$out->addLink( array(
-						'rel' => 'alternate',
-						'hreflang' => $_v,
-						'href' => $this->mTitle->getLocalURL( '', $_v ) )
-					);
-				}
-			} else {
-				$out->addLink( array(
-					'rel' => 'canonical',
-					'href' => $this->mTitle->getFullURL() )
-				);
-			}
-		}
-		
-		$copyright = '';
-		if ( $wgRightsPage ) {
-			$copy = Title::newFromText( $wgRightsPage );
-
-			if ( $copy ) {
-				$copyright = $copy->getLocalURL();
-			}
-		}
-
-		if ( !$copyright && $wgRightsUrl ) {
-			$copyright = $wgRightsUrl;
-		}
+	protected function setMembers() {
+		$this->userpage = $this->getUser()->getUserPage()->getPrefixedText();
+	}
 
-		if ( $copyright ) {
-			$out->addLink( array(
-				'rel' => 'copyright',
-				'href' => $copyright )
-			);
-		}
+	/**
+	 * Get the current revision ID
+	 *
+	 * @return Integer
+	 */
+	public function getRevisionId() {
+		return $this->getOutput()->getRevisionId();
 	}
 
 	/**
-	 * Set some local variables
+	 * Whether the revision displayed is the latest revision of the page
+	 *
+	 * @return Boolean
 	 */
-	protected function setMembers() {
-		global $wgUser;
-		$this->mUser = $wgUser;
-		$this->userpage = $wgUser->getUserPage()->getPrefixedText();
-		$this->usercss = false;
+	public function isRevisionCurrent() {
+		$revID = $this->getRevisionId();
+		return $revID == 0 || $revID == $this->getTitle()->getLatestRevID();
 	}
 
 	/**
-	 * Set the title
+	 * Set the "relevant" title
+	 * @see self::getRelevantTitle()
 	 * @param $t Title object to use
 	 */
-	public function setTitle( $t ) {
-		$this->mTitle = $t;
+	public function setRelevantTitle( $t ) {
+		$this->mRelevantTitle = $t;
 	}
 
-	/** Get the title */
-	public function getTitle() {
-		return $this->mTitle;
+	/**
+	 * Return the "relevant" title.
+	 * A "relevant" title is not necessarily the actual title of the page.
+	 * Special pages like Special:MovePage use set the page they are acting on
+	 * as their "relevant" title, this allows the skin system to display things
+	 * such as content tabs which belong to to that page instead of displaying
+	 * a basic special page tab which has almost no meaning.
+	 *
+	 * @return Title
+	 */
+	public function getRelevantTitle() {
+		if ( isset($this->mRelevantTitle) ) {
+			return $this->mRelevantTitle;
+		}
+		return $this->getTitle();
 	}
 
 	/**
-	 * Outputs the HTML generated by other functions.
-	 * @param $out Object: instance of OutputPage
+	 * Set the "relevant" user
+	 * @see self::getRelevantUser()
+	 * @param $u User object to use
 	 */
-	function outputPage( OutputPage $out ) {
-		global $wgDebugComments;
-		wfProfileIn( __METHOD__ );
-
-		$this->setMembers();
-		$this->initPage( $out );
-
-		// See self::afterContentHook() for documentation
-		$afterContent = $this->afterContentHook();
-
-		$out->out( $out->headElement( $this ) );
+	public function setRelevantUser( $u ) {
+		$this->mRelevantUser = $u;
+	}
 
-		if ( $wgDebugComments ) {
-			$out->out( "<!-- Wiki debugging output:\n" .
-			  $out->mDebugtext . "-->\n" );
+	/**
+	 * Return the "relevant" user.
+	 * A "relevant" user is similar to a relevant title. Special pages like
+	 * Special:Contributions mark the user which they are relevant to so that
+	 * things like the toolbox can display the information they usually are only
+	 * able to display on a user's userpage and talkpage.
+	 * @return User
+	 */
+	public function getRelevantUser() {
+		if ( isset($this->mRelevantUser) ) {
+			return $this->mRelevantUser;
+		}
+		$title = $this->getRelevantTitle();
+		if( $title->getNamespace() == NS_USER || $title->getNamespace() == NS_USER_TALK ) {
+			$rootUser = strtok( $title->getText(), '/' );
+			if ( User::isIP( $rootUser ) ) {
+				$this->mRelevantUser = User::newFromName( $rootUser, false );
+			} else {
+				$user = User::newFromName( $rootUser, false );
+				if ( $user->isLoggedIn() ) {
+					$this->mRelevantUser = $user;
+				}
+			}
+			return $this->mRelevantUser;
 		}
-
-		$out->out( $this->beforeContent() );
-
-		$out->out( $out->mBodytext . "\n" );
-
-		$out->out( $this->afterContent() );
-
-		$out->out( $afterContent );
-
-		$out->out( $this->bottomScripts( $out ) );
-
-		$out->out( wfReportTime() );
-
-		$out->out( "\n</body></html>" );
-		wfProfileOut( __METHOD__ );
+		return null;
 	}
 
+	/**
+	 * Outputs the HTML generated by other functions.
+	 * @param $out OutputPage
+	 */
+	abstract function outputPage( OutputPage $out );
+
 	static function makeVariablesScript( $data ) {
 		if ( $data ) {
 			return Html::inlineScript(
@@ -409,50 +304,7 @@ class Skin extends Linker {
 			);
 		} else {
 			return '';
-		} 
-	}
-
-	/**
-	 * 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, $wgArticle, $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' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
-			'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 );
 	}
 
 	/**
@@ -466,72 +318,54 @@ class Skin extends Linker {
 	 * @return bool
 	 */
 	public function userCanPreview( $action ) {
-		global $wgRequest, $wgUser;
-
 		if ( $action != 'submit' ) {
 			return false;
 		}
-		if ( !$wgRequest->wasPosted() ) {
+		if ( !$this->getRequest()->wasPosted() ) {
 			return false;
 		}
-		if ( !$this->mTitle->userCanEditCssSubpage() ) {
+		if ( !$this->getTitle()->userCanEditCssSubpage() ) {
 			return false;
 		}
-		if ( !$this->mTitle->userCanEditJsSubpage() ) {
+		if ( !$this->getTitle()->userCanEditJsSubpage() ) {
 			return false;
 		}
 
-		return $wgUser->matchEditToken(
-			$wgRequest->getVal( 'wpEditToken' ) );
+		return $this->getUser()->matchEditToken(
+			$this->getRequest()->getVal( 'wpEditToken' ) );
 	}
 
 	/**
 	 * Generated JavaScript action=raw&gen=js
-	 * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
-	 * nated together.  For some bizarre reason, it does *not* return any
-	 * custom user JS from subpages.  Huh?
-	 *
-	 * There's absolutely no reason to have separate Monobook/Common JSes.
-	 * Any JS that cares can just check the skin variable generated at the
-	 * top.  For now Monobook.js will be maintained, but it should be consi-
-	 * dered deprecated.
+	 * This used to load MediaWiki:Common.js and the skin-specific style
+	 * before the ResourceLoader.
 	 *
+	 * @deprecated since 1.18 Use the ResourceLoader instead. This may be removed at some
+	 * point.
 	 * @param $skinName String: If set, overrides the skin name
-	 * @return string
+	 * @return String
 	 */
 	public function generateUserJs( $skinName = null ) {
-		
-		// Stub - see ResourceLoaderSiteModule, CologneBlue, Simple and Standard skins override this
-		
 		return '';
 	}
 
 	/**
 	 * Generate user stylesheet for action=raw&gen=css
+	 *
+	 * @deprecated since 1.18 Use the ResourceLoader instead. This may be removed at some
+	 * point.
+	 * @return String
 	 */
 	public function generateUserStylesheet() {
-		
-		// Stub - see ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this
-		
-		return '';
-	}
-
-	/**
-	 * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
-	 * Anything in here won't be generated if $wgAllowUserCssPrefs is false.
-	 */
-	protected function reallyGenerateUserStylesheet() {
-		
-		// Stub - see  ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this
-		
 		return '';
 	}
 
 	/**
 	 * @private
+	 * @todo document
+	 * @param $out OutputPage
 	 */
 	function setupUserCss( OutputPage $out ) {
-		global $wgRequest;
 		global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs;
 
 		wfProfileIn( __METHOD__ );
@@ -544,14 +378,17 @@ class Skin extends Linker {
 
 		// Per-site custom styles
 		if ( $wgUseSiteCss ) {
-			$out->addModuleStyles( 'site' );
+			$out->addModuleStyles( array( 'site', 'noscript' ) );
+			if( $this->getUser()->isLoggedIn() ){
+				$out->addModuleStyles( 'user.groups' );
+			}
 		}
 
 		// Per-user custom styles
 		if ( $wgAllowUserCss ) {
-			if ( $this->mTitle->isCssSubpage() && $this->userCanPreview( $wgRequest->getVal( 'action' ) ) ) {
-				// @FIXME: properly escape the cdata!
-				$out->addInlineStyle( $wgRequest->getText( 'wpTextbox1' ) );
+			if ( $this->getTitle()->isCssSubpage() && $this->userCanPreview( $this->getRequest()->getVal( 'action' ) ) ) {
+				// @todo FIXME: Properly escape the cdata!
+				$out->addInlineStyle( $this->getRequest()->getText( 'wpTextbox1' ) );
 			} else {
 				$out->addModuleStyles( 'user' );
 			}
@@ -584,21 +421,32 @@ class Skin extends Linker {
 
 	/**
 	 * Add skin specific stylesheets
+	 * Calling this method with an $out of anything but the same OutputPage
+	 * inside ->getOutput() is deprecated. The $out arg is kept
+	 * for compatibility purposes with skins.
 	 * @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 );
 
+	/**
+	 * TODO: document
+	 * @param $title Title
+	 * @return String
+	 */
 	function getPageClasses( $title ) {
+		global $wgRequest;
 		$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 ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
+			if ( $canonicalName ) {
+				$type .= ' ' . Sanitizer::escapeClass( "mw-special-$canonicalName" );
+			} else {
+				$type .= ' mw-invalidspecialpage';
+			}
 		} elseif ( $title->isTalkPage() ) {
 			$type = 'ns-talk';
 		} else {
@@ -606,14 +454,21 @@ class Skin extends Linker {
 		}
 
 		$name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() );
-
-		return "$numeric $type $name";
+		
+		if ( $wgRequest->getVal('action') ) {
+			$action = 'action-' . $wgRequest->getVal('action');
+		} else {
+			$action = 'action-view';
+		}
+		return "$numeric $type $name $action";
 	}
 
 	/**
 	 * This will be called by OutputPage::headElement when it is creating the
 	 * <body> tag, skins can override it if they have a need to add in any
 	 * body attributes or classes of their own.
+	 * @param $out OutputPage
+	 * @param $bodyAttrs Array
 	 */
 	function addToBodyAttributes( $out, &$bodyAttrs ) {
 		// does nothing by default
@@ -621,124 +476,43 @@ class Skin extends Linker {
 
 	/**
 	 * URL to the logo
+	 * @return String
 	 */
 	function getLogo() {
 		global $wgLogo;
 		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;
+		global $wgUseCategoryBrowser;
+
+		$out = $this->getOutput();
 
-		if ( count( $wgOut->mCategoryLinks ) == 0 ) {
+		if ( count( $out->mCategoryLinks ) == 0 ) {
 			return '';
 		}
 
-		# Separator
-		$sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities' ) );
+		$embed = "<li>";
+		$pop = "</li>";
 
-		// Use Unicode bidi embedding override characters,
-		// to make sure links don't smash each other up in ugly ways.
-		$dir = $wgContLang->getDir();
-		$embed = "<span dir='$dir'>";
-		$pop = '</span>';
-
-		$allCats = $wgOut->getCategoryLinks();
+		$allCats = $out->getCategoryLinks();
 		$s = '';
 		$colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 
 		if ( !empty( $allCats['normal'] ) ) {
-			$t = $embed . implode( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
+			$t = $embed . implode( "{$pop}{$embed}" , $allCats['normal'] ) . $pop;
 
 			$msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
 			$s .= '<div id="mw-normal-catlinks">' .
-				$this->link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
-				. $colon . $t . '</div>';
+				Linker::link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
+				. $colon . '<ul>' . $t . '</ul>' . '</div>';
 		}
 
 		# Hidden categories
 		if ( isset( $allCats['hidden'] ) ) {
-			if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
+			if ( $this->getUser()->getBoolOption( 'showhiddencats' ) ) {
 				$class = 'mw-hidden-cats-user-shown';
-			} elseif ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
+			} elseif ( $this->getTitle()->getNamespace() == NS_CATEGORY ) {
 				$class = 'mw-hidden-cats-ns-shown';
 			} else {
 				$class = 'mw-hidden-cats-hidden';
@@ -746,7 +520,7 @@ class Skin extends Linker {
 
 			$s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" .
 				wfMsgExt( 'hidden-categories', array( 'parsemag', 'escapenoentities' ), count( $allCats['hidden'] ) ) .
-				$colon . $embed . implode( "$pop $sep $embed", $allCats['hidden'] ) . $pop .
+				$colon . '<ul>' . $embed . implode( "{$pop}{$embed}" , $allCats['hidden'] ) . $pop . '</ul>' .
 				'</div>';
 		}
 
@@ -756,10 +530,10 @@ class Skin extends Linker {
 			$s .= '<br /><hr />';
 
 			# get a big array of the parents tree
-			$parenttree = $this->mTitle->getParentCategoryTree();
+			$parenttree = $this->getTitle()->getParentCategoryTree();
 			# Skin object passed by reference cause it can not be
 			# accessed under the method subfunction drawCategoryBrowser
-			$tempout = explode( "\n", $this->drawCategoryBrowser( $parenttree, $this ) );
+			$tempout = explode( "\n", $this->drawCategoryBrowser( $parenttree ) );
 			# Clean out bogus first entry and sort them
 			unset( $tempout[0] );
 			asort( $tempout );
@@ -773,10 +547,9 @@ class Skin extends Linker {
 	/**
 	 * Render the array as a serie of links.
 	 * @param $tree Array: categories tree returned by Title::getParentCategoryTree
-	 * @param &skin Object: skin passed by reference
 	 * @return String separated by &gt;, terminate with "\n"
 	 */
-	function drawCategoryBrowser( $tree, &$skin ) {
+	function drawCategoryBrowser( $tree ) {
 		$return = '';
 
 		foreach ( $tree as $element => $parent ) {
@@ -785,28 +558,28 @@ class Skin extends Linker {
 				$return .= "\n";
 			} else {
 				# grab the others elements
-				$return .= $this->drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
+				$return .= $this->drawCategoryBrowser( $parent ) . ' &gt; ';
 			}
 
 			# add our current element to the list
 			$eltitle = Title::newFromText( $element );
-			$return .=  $skin->link( $eltitle, $eltitle->getText() );
+			$return .=  Linker::link( $eltitle, $eltitle->getText() );
 		}
 
 		return $return;
 	}
 
 	function getCategories() {
+		$out = $this->getOutput();
+
 		$catlinks = $this->getCategoryLinks();
 
 		$classes = 'catlinks';
 
-		global $wgOut, $wgUser;
-
 		// Check what we're showing
-		$allCats = $wgOut->getCategoryLinks();
-		$showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
-						$this->mTitle->getNamespace() == NS_CATEGORY;
+		$allCats = $out->getCategoryLinks();
+		$showHidden = $this->getUser()->getBoolOption( 'showhiddencats' ) ||
+						$this->getTitle()->getNamespace() == NS_CATEGORY;
 
 		if ( empty( $allCats['normal'] ) && !( !empty( $allCats['hidden'] ) && $showHidden ) ) {
 			$classes .= ' catlinks-allhidden';
@@ -815,10 +588,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).
@@ -831,7 +600,7 @@ class Skin extends Linker {
 	 * The output of this function gets processed in SkinTemplate::outputPage() for
 	 * the SkinTemplate based skins, all other skins should directly echo it.
 	 *
-	 * Returns an empty string by default, if not changed by any hook function.
+	 * @return String, empty by default, if not changed by any hook function.
 	 */
 	protected function afterContentHook() {
 		$data = '';
@@ -860,11 +629,11 @@ class Skin extends Linker {
 	 * @return String HTML containing debug data, if enabled (otherwise empty).
 	 */
 	protected function generateDebugHTML() {
-		global $wgShowDebug, $wgOut;
+		global $wgShowDebug;
 
 		if ( $wgShowDebug ) {
-			$listInternals = $this->formatDebugHTML( $wgOut->mDebugtext );
-			return "\n<hr />\n<strong>Debug data:</strong><ul style=\"font-family:monospace;\" id=\"mw-debug-html\">" .
+			$listInternals = $this->formatDebugHTML( $this->getOutput()->mDebugtext );
+			return "\n<hr />\n<strong>Debug data:</strong><ul id=\"mw-debug-html\">" .
 				$listInternals . "</ul>\n";
 		}
 
@@ -872,15 +641,26 @@ class Skin extends Linker {
 	}
 
 	private function formatDebugHTML( $debugText ) {
+		global $wgDebugTimestamps;
+
 		$lines = explode( "\n", $debugText );
 		$curIdent = 0;
 		$ret = '<li>';
 
 		foreach ( $lines as $line ) {
+			$pre = '';
+			if ( $wgDebugTimestamps ) {
+				$matches = array();
+				if ( preg_match( '/^(\d+\.\d+\s{2})/', $line, $matches ) ) {
+					$pre = $matches[1];
+					$line = substr( $line, strlen( $pre ) );
+				}
+			}
 			$display = ltrim( $line );
 			$ident = strlen( $line ) - strlen( $display );
 			$diff = $ident - $curIdent;
 
+			$display = $pre . $display;
 			if ( $display == '' ) {
 				$display = "\xc2\xa0";
 			}
@@ -900,7 +680,7 @@ class Skin extends Linker {
 			} else {
 				$ret .= str_repeat( "<ul><li>\n", $diff );
 			}
-			$ret .= $display . "\n";
+			$ret .= "<tt>$display</tt>\n";
 
 			$curIdent = $ident;
 		}
@@ -912,130 +692,46 @@ class Skin extends Linker {
 
 	/**
 	 * 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
 	 * @return String HTML-wrapped JS code to be put before </body>
 	 */
 	function bottomScripts( $out ) {
-		$bottomScriptText = "\n" . $out->getHeadScripts( $this );
+		// TODO and the suckage continues. This function is really just a wrapper around
+		// OutputPage::getBottomScripts() which takes a Skin param. This should be cleaned
+		// up at some point
+		$bottomScriptText = $out->getBottomScripts( $this );
 		wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
 
 		return $bottomScriptText;
 	}
 
-	/** @return string Retrievied from HTML text */
+	/**
+	 * Text with the permalink to the source page,
+	 * usually shown on the footer of a printed page
+	 *
+	 * @return string HTML text with an URL
+	 */
 	function printSource() {
-		$url = htmlspecialchars( $this->mTitle->getFullURL() );
-		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;
+		$oldid = $this->getRevisionId();
+		if ( $oldid ) {
+			$url = htmlspecialchars( $this->getTitle()->getCanonicalURL( 'oldid=' . $oldid ) );
+		} else {
+			// oldid not available for non existing pages
+			$url = htmlspecialchars( $this->getTitle()->getCanonicalURL() );
 		}
-
-		return $wgLang->pipeList( $s );
+		return wfMsg( 'retrievedfrom', '<a href="' . $url . '">' . $url . '</a>' );
 	}
 
 	function getUndeleteLink() {
-		global $wgUser, $wgLang, $wgRequest;
+		$action = $this->getRequest()->getVal( 'action', 'view' );
 
-		$action = $wgRequest->getVal( 'action', 'view' );
+		if ( $this->getUser()->isAllowed( 'deletedhistory' ) &&
+			( $this->getTitle()->getArticleId() == 0 || $action == 'history' ) ) {
+			$n = $this->getTitle()->isDeleted();
 
-		if ( $wgUser->isAllowed( 'deletedhistory' ) &&
-			( $this->mTitle->getArticleId() == 0 || $action == 'history' ) ) {
-			$n = $this->mTitle->isDeleted();
 
 			if ( $n ) {
-				if ( $wgUser->isAllowed( 'undelete' ) ) {
+				if ( $this->getUser()->isAllowed( 'undelete' ) ) {
 					$msg = 'thisisdeleted';
 				} else {
 					$msg = 'viewdeleted';
@@ -1043,9 +739,9 @@ class Skin extends Linker {
 
 				return wfMsg(
 					$msg,
-					$this->link(
-						SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
-						wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ),
+					Linker::link(
+						SpecialPage::getTitleFor( 'Undelete', $this->getTitle()->getPrefixedDBkey() ),
+						wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $this->getLang()->formatNum( $n ) ),
 						array(),
 						array(),
 						array( 'known', 'noclasses' )
@@ -1057,64 +753,16 @@ 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() {
+		$out = $this->getOutput();
 		$subpages = '';
 
-		if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this ) ) ) {
+		if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this, $out ) ) ) {
 			return $subpages;
 		}
 
-		global $wgOut;
-
-		if ( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
-			$ptext = $this->mTitle->getPrefixedText();
+		if ( $out->isArticle() && MWNamespace::hasSubpages( $out->getTitle()->getNamespace() ) ) {
+			$ptext = $this->getTitle()->getPrefixedText();
 			if ( preg_match( '/\//', $ptext ) ) {
 				$links = explode( '/', $ptext );
 				array_pop( $links );
@@ -1159,73 +807,13 @@ class Skin extends Linker {
 
 	/**
 	 * Returns true if the IP should be shown in the header
+	 * @return Bool
 	 */
 	function showIPinHeader() {
 		global $wgShowIPinHeader;
 		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();
@@ -1235,246 +823,13 @@ 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;
-
-		$oldid = $wgRequest->getVal( 'oldid' );
-		$diff = $wgRequest->getVal( 'diff' );
-
-		if ( !$wgOut->isArticle() ) {
-			return '';
-		}
-
-		if ( !$wgArticle instanceof Article ) {
-			return '';
-		}
-
-		if ( isset( $oldid ) || isset( $diff ) ) {
-			return '';
-		}
-
-		if ( 0 == $wgArticle->getID() ) {
-			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, $wgArticle;
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText;
 
 		if ( $type == 'detect' ) {
-			$diff = $wgRequest->getVal( 'diff' );
-			$isCur = $wgArticle && $wgArticle->isCurrent();
+			$diff = $this->getRequest()->getVal( 'diff' );
 
-			if ( is_null( $diff ) && !$isCur && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+			if ( is_null( $diff ) && !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
 				$type = 'history';
 			} else {
 				$type = 'normal';
@@ -1491,9 +846,9 @@ class Skin extends Linker {
 
 		if ( $wgRightsPage ) {
 			$title = Title::newFromText( $wgRightsPage );
-			$link = $this->linkKnown( $title, $wgRightsText );
+			$link = Linker::linkKnown( $title, $wgRightsText );
 		} elseif ( $wgRightsUrl ) {
-			$link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
+			$link = Linker::makeExternalLink( $wgRightsUrl, $wgRightsText );
 		} elseif ( $wgRightsText ) {
 			$link = $wgRightsText;
 		} else {
@@ -1504,9 +859,7 @@ class Skin extends Linker {
 		// Allow for site and per-namespace customization of copyright notice.
 		$forContent = true;
 
-		if ( isset( $wgArticle ) ) {
-			wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link, &$forContent ) );
-		}
+		wfRunHooks( 'SkinCopyrightFooter', array( $this->getTitle(), $type, &$msg, &$link, &$forContent ) );
 
 		if ( $forContent ) {
 			$out .= wfMsgForContent( $msg, $link );
@@ -1552,22 +905,26 @@ class Skin extends Linker {
 
 		$url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
 		$text = '<a href="http://www.mediawiki.org/"><img src="' . $url . '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
-		wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );	
+		wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );
 		return $text;
 	}
 
-	function lastModified() {
-		global $wgLang, $wgArticle;
-
-		if ( $this->mRevisionId && $this->mRevisionId != $wgArticle->getLatest() ) {
-			$timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
+	/**
+	 * 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 ) {
+		if ( !$this->isRevisionCurrent() ) {
+			$timestamp = Revision::getTimestampFromId( $this->getTitle(), $this->getRevisionId() );
 		} else {
-			$timestamp = $wgArticle->getTimestamp();
+			$timestamp = $article->getTimestamp();
 		}
 
 		if ( $timestamp ) {
-			$d = $wgLang->date( $timestamp, true );
-			$t = $wgLang->time( $timestamp, true );
+			$d = $this->getLang()->date( $timestamp, true );
+			$t = $this->getLang()->time( $timestamp, true );
 			$s = ' ' . wfMsg( 'lastmodifiedat', $d, $t );
 		} else {
 			$s = '';
@@ -1598,43 +955,10 @@ class Skin extends Linker {
 	}
 
 	/**
-	 * 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
-	 * @param $withImage Boolean: Whether to use the icon's image or output a text-only footericon
+	 * @param $withImage Bool|String: Whether to use the icon's image or output a text-only footericon
+	 * @return String HTML
 	 */
 	function makeFooterIcon( $icon, $withImage = 'withImage' ) {
 		if ( is_string( $icon ) ) {
@@ -1659,7 +983,7 @@ class Skin extends Linker {
 	 * @return string
 	 */
 	function mainPageLink() {
-		$s = $this->link(
+		$s = Linker::link(
 			Title::newMainPage(),
 			wfMsg( 'mainpage' ),
 			array(),
@@ -1681,7 +1005,7 @@ class Skin extends Linker {
 			// but we make the link target be the one site-wide page.
 			$title = Title::newFromText( wfMsgForContent( $page ) );
 
-			return $this->linkKnown(
+			return Linker::linkKnown(
 				$title,
 				wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) )
 			);
@@ -1690,6 +1014,7 @@ class Skin extends Linker {
 
 	/**
 	 * Gets the link to the wiki's privacy policy page.
+	 * @return String HTML
 	 */
 	function privacyLink() {
 		return $this->footerLink( 'privacy', 'privacypage' );
@@ -1697,6 +1022,7 @@ class Skin extends Linker {
 
 	/**
 	 * Gets the link to the wiki's about page.
+	 * @return String HTML
 	 */
 	function aboutLink() {
 		return $this->footerLink( 'aboutsite', 'aboutpage' );
@@ -1704,37 +1030,12 @@ class Skin extends Linker {
 
 	/**
 	 * Gets the link to the wiki's general disclaimers page.
+	 * @return String HTML
 	 */
 	function disclaimerLink() {
 		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.
@@ -1743,345 +1044,43 @@ class Skin extends Linker {
 	 * @private
 	 */
 	function editUrlOptions() {
-		global $wgArticle;
-
 		$options = array( 'action' => 'edit' );
 
-		if ( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
-			$options['oldid'] = intval( $this->mRevisionId );
+		if ( !$this->isRevisionCurrent() ) {
+			$options['oldid'] = intval( $this->getRevisionId() );
 		}
 
 		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 );
-		return $wgUser->canSendEmail() && # the sending user must have a confirmed email address
+		return $this->getUser()->canSendEmail() && # the sending user must have a confirmed email address
 			$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
 	 * and includes the style version inside of the url.
-	 * @param $name String: The name or path of the common file to return the full path for.
+	 * @param $name String: The name or path of a skin resource file
 	 * @return String The fully resolved style path url including styleversion
 	 */
 	function getCommonStylePath( $name ) {
 		global $wgStylePath, $wgStyleVersion;
-		return "{$wgStylePath}/common/$name?{$wgStyleVersion}";
+		return "$wgStylePath/common/$name?$wgStyleVersion";
 	}
 
 	/**
 	 * Return a fully resolved style path url to images or styles stored in the curent skins's folder.
 	 * This method returns a url resolved using the configured skin style path
 	 * and includes the style version inside of the url.
-	 * @param $name String: The name or path of the skin resource file to return the full path for.
+	 * @param $name String: The name or path of a skin resource file
 	 * @return String The fully resolved style path url including styleversion
 	 */
 	function getSkinStylePath( $name ) {
 		global $wgStylePath, $wgStyleVersion;
-		return "{$wgStylePath}/{$this->stylename}/$name?{$wgStyleVersion}";
+		return "$wgStylePath/{$this->stylename}/$name?$wgStyleVersion";
 	}
 
 	/* these are used extensively in SkinTemplate, but also some other places */
@@ -2093,7 +1092,7 @@ class Skin extends Linker {
 	}
 
 	static function makeSpecialUrl( $name, $urlaction = '' ) {
-		$title = SpecialPage::getTitleFor( $name );
+		$title = SpecialPage::getSafeTitleFor( $name );
 		return $title->getLocalURL( $urlaction );
 	}
 
@@ -2118,6 +1117,8 @@ class Skin extends Linker {
 	/**
 	 * If url string starts with http, consider as external URL, else
 	 * internal
+	 * @param $name String
+	 * @return String URL
 	 */
 	static function makeInternalOrExternalUrl( $name ) {
 		if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $name ) ) {
@@ -2148,6 +1149,9 @@ class Skin extends Linker {
 
 	/**
 	 * Make URL details where the article exists (or at least it's convenient to think so)
+	 * @param $name String Article name
+	 * @param $urlaction String
+	 * @return Array
 	 */
 	static function makeKnownUrlDetails( $name, $urlaction = '' ) {
 		$title = Title::newFromText( $name );
@@ -2176,10 +1180,9 @@ class Skin extends Linker {
 	 */
 	function buildSidebar() {
 		global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
-		global $wgLang;
 		wfProfileIn( __METHOD__ );
 
-		$key = wfMemcKey( 'sidebar', $wgLang->getCode() );
+		$key = wfMemcKey( 'sidebar', $this->getLang()->getCode() );
 
 		if ( $wgEnableSidebarCache ) {
 			$cachedsidebar = $parserMemc->get( $key );
@@ -2210,7 +1213,7 @@ class Skin extends Linker {
 	 * @param $message String
 	 */
 	function addToSidebar( &$bar, $message ) {
-		$this->addToSidebarPlain( $bar, wfMsgForContent( $message ) );
+		$this->addToSidebarPlain( $bar, wfMsgForContentNoTrans( $message ) );
 	}
 
 	/**
@@ -2218,10 +1221,10 @@ class Skin extends Linker {
 	 * @since 1.17
 	 * @param &$bar array
 	 * @param $text string
+	 * @return Array
 	 */
 	function addToSidebarPlain( &$bar, $text ) {
 		$lines = explode( "\n", $text );
-		$wikiBar = array(); # We need to handle the wikitext on a different variable, to avoid trying to do an array operation on text, which would be a fatal error.
 
 		$heading = '';
 
@@ -2239,25 +1242,40 @@ class Skin extends Linker {
 				$line = trim( $line, '* ' );
 
 				if ( strpos( $line, '|' ) !== false ) { // sanity check
+					$line = MessageCache::singleton()->transform( $line, false, null, $this->getTitle() );
 					$line = array_map( 'trim', explode( '|', $line, 2 ) );
-					$link = wfMsgForContent( $line[0] );
+					$extraAttribs = array();
 
-					if ( $link == '-' ) {
-						continue;
+					$msgLink = wfMessage( $line[0] )->inContentLanguage();
+					if ( $msgLink->exists() ) {
+						$link = $msgLink->text();
+						if ( $link == '-' ) {
+							continue;
+						}
+					} else {
+						$link = $line[0];
 					}
 
-					$text = wfMsgExt( $line[1], 'parsemag' );
-
-					if ( wfEmptyMsg( $line[1], $text ) ) {
+					$msgText = wfMessage( $line[1] );
+					if ( $msgText->exists() ) {
+						$text = $msgText->text();
+					} else {
 						$text = $line[1];
 					}
 
-					if ( wfEmptyMsg( $line[0], $link ) ) {
-						$link = $line[0];
-					}
-
 					if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
 						$href = $link;
+						
+						// Parser::getExternalLinkAttribs won't work here because of the Namespace things
+						global $wgNoFollowLinks, $wgNoFollowDomainExceptions;
+						if ( $wgNoFollowLinks && !wfMatchesDomainList( $href, $wgNoFollowDomainExceptions ) ) {
+							$extraAttribs['rel'] = 'nofollow';
+						}
+						
+						global $wgExternalLinkTarget;
+						if ( $wgExternalLinkTarget) {
+							$extraAttribs['target'] = $wgExternalLinkTarget;
+						}
 					} else {
 						$title = Title::newFromText( $link );
 
@@ -2269,31 +1287,18 @@ class Skin extends Linker {
 						}
 					}
 
-					$bar[$heading][] = array(
+					$bar[$heading][] = array_merge( array(
 						'text' => $text,
 						'href' => $href,
-						'id' => 'n-' . strtr( $line[1], ' ', '-' ),
+						'id' => 'n-' . Sanitizer::escapeId( strtr( $line[1], ' ', '-' ), 'noninitial' ),
 						'active' => false
-					);
-				} else if ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
-					global $wgParser, $wgTitle;
-
-					$line = substr( $line, 2, strlen( $line ) - 4 );
-
-					$options = new ParserOptions();
-					$options->setEditSection( false );
-					$options->setInterfaceMessage( true );
-					$wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $wgTitle, $options )->getText();
+					), $extraAttribs );
 				} else {
 					continue;
 				}
 			}
 		}
 
-		if ( count( $wikiBar ) > 0 ) {
-			$bar = array_merge( $bar, $wikiBar );
-		}
-
 		return $bar;
 	}
 
@@ -2314,16 +1319,16 @@ class Skin extends Linker {
 	 * @return MediaWiki message or if no new talk page messages, nothing
 	 */
 	function getNewtalks() {
-		global $wgUser, $wgOut;
+		$out = $this->getOutput();
 
-		$newtalks = $wgUser->getNewMessageLinks();
+		$newtalks = $this->getUser()->getNewMessageLinks();
 		$ntl = '';
 
 		if ( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-			$userTitle = $this->mUser->getUserPage();
+			$userTitle = $this->getUser()->getUserPage();
 			$userTalkTitle = $userTitle->getTalkPage();
 
-			if ( !$userTalkTitle->equals( $this->mTitle ) ) {
+			if ( !$userTalkTitle->equals( $out->getTitle() ) ) {
 				$newMessagesLink = $this->link(
 					$userTalkTitle,
 					wfMsgHtml( 'newmessageslink' ),
@@ -2346,7 +1351,7 @@ class Skin extends Linker {
 					$newMessagesDiffLink
 				);
 				# Disable Squid cache
-				$wgOut->setSquidMaxage( 0 );
+				$out->setSquidMaxage( 0 );
 			}
 		} elseif ( count( $newtalks ) ) {
 			// _>" " for BC <= 1.16
@@ -2361,9 +1366,187 @@ class Skin extends Linker {
 			}
 			$parts = implode( $sep, $msgs );
 			$ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
-			$wgOut->setSquidMaxage( 0 );
+			$out->setSquidMaxage( 0 );
 		}
 
 		return $ntl;
 	}
+
+	/**
+	 * Get a cached notice
+	 *
+	 * @param $name String: message name, or 'default' for $wgSiteNotice
+	 * @return String: HTML fragment
+	 */
+	private function getCachedNotice( $name ) {
+		global $wgRenderHashAppend, $parserMemc, $wgContLang;
+
+		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 ) {
+			$parsed = $this->getOutput()->parse( $notice );
+			$parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+			$notice = $parsed;
+		}
+
+		$notice = Html::rawElement( 'div', array( 'id' => 'localNotice',
+			'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ), $notice );
+		wfProfileOut( __METHOD__ );
+		return $notice;
+	}
+
+	/**
+	 * Get a notice based on page's namespace
+	 *
+	 * @return String: HTML fragment
+	 */
+	function getNamespaceNotice() {
+		wfProfileIn( __METHOD__ );
+
+		$key = 'namespacenotice-' . $this->getTitle()->getNsText();
+		$namespaceNotice = $this->getCachedNotice( $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() {
+		wfProfileIn( __METHOD__ );
+		$siteNotice = '';
+
+		if ( wfRunHooks( 'SiteNoticeBefore', array( &$siteNotice, $this ) ) ) {
+			if ( is_object( $this->getUser() ) && $this->getUser()->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;
+	}
+
+	/**
+	 * Create a section edit link.  This supersedes editSectionLink() and
+	 * editSectionLinkForOther().
+	 *
+	 * @param $nt      Title  The title being linked to (may not be the same as
+	 *   $wgTitle, if the section is included from a template)
+	 * @param $section string The designation of the section being pointed to,
+	 *   to be included in the link, like "&section=$section"
+	 * @param $tooltip string The tooltip to use for the link: will be escaped
+	 *   and wrapped in the 'editsectionhint' message
+	 * @param $lang    string Language code
+	 * @return         string HTML to use for edit link
+	 */
+	public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) {
+		// HTML generated here should probably have userlangattributes
+		// added to it for LTR text on RTL pages
+		$attribs = array();
+		if ( !is_null( $tooltip ) ) {
+			# Bug 25462: undo double-escaping.
+			$tooltip = Sanitizer::decodeCharReferences( $tooltip );
+			$attribs['title'] = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag' ), $tooltip );
+		}
+		$link = Linker::link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ),
+			$attribs,
+			array( 'action' => 'edit', 'section' => $section ),
+			array( 'noclasses', 'known' )
+		);
+
+		# Run the old hook.  This takes up half of the function . . . hopefully
+		# we can rid of it someday.
+		$attribs = '';
+		if ( $tooltip ) {
+			$attribs = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'escape' ), $tooltip );
+			$attribs = " title=\"$attribs\"";
+		}
+		$result = null;
+		wfRunHooks( 'EditSectionLink', array( &$this, $nt, $section, $attribs, $link, &$result, $lang ) );
+		if ( !is_null( $result ) ) {
+			# For reverse compatibility, add the brackets *after* the hook is
+			# run, and even add them to hook-provided text.  (This is the main
+			# reason that the EditSectionLink hook is deprecated in favor of
+			# DoEditSectionLink: it can't change the brackets or the span.)
+			$result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $result );
+			return "<span class=\"editsection\">$result</span>";
+		}
+
+		# Add the brackets and the span, and *then* run the nice new hook, with
+		# clean and non-redundant arguments.
+		$result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $link );
+		$result = "<span class=\"editsection\">$result</span>";
+
+		wfRunHooks( 'DoEditSectionLink', array( $this, $nt, $section, $tooltip, &$result, $lang ) );
+		return $result;
+	}
+
+	/**
+	 * Use PHP's magic __call handler to intercept legacy calls to the linker
+	 * for backwards compatibility.
+	 *
+	 * @param $fname String Name of called method
+	 * @param $args Array Arguments to the method
+	 */
+	function __call( $fname, $args ) {
+		$realFunction = array( 'Linker', $fname );
+		if ( is_callable( $realFunction ) ) {
+			return call_user_func_array( $realFunction, $args );
+		} else {
+			$className = get_class( $this );
+			throw new MWException( "Call to undefined method $className::$fname" );
+		}
+	}
+
 }