X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkin.php;h=17da161abe3bfbeba3798e057238d34cb6c5c1ef;hb=9e638dbef402377fb1c02f7228ec2fa611ee7aa0;hp=425aa83ca87152eec70ffdf58b335b13566f5e9e;hpb=d0aeaa55ff1a1fa0aaa554f5b98c5f9c075878f3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Skin.php b/includes/Skin.php
index 425aa83ca8..17da161abe 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -23,7 +23,9 @@ class Skin extends Linker {
 	protected $searchboxes = '';
 	/**#@-*/
 	protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
-	protected $skinname = 'standard' ;
+	protected $skinname = 'standard';
+	// @fixme Should be protected :-\
+	var $mTitle = null;
 
 	/** Constructor, call parent constructor */
 	function Skin() { parent::__construct(); }
@@ -46,10 +48,10 @@ class Skin extends Linker {
 			$skinDir = dir( $wgStyleDirectory );
 
 			# while code from www.php.net
-			while (false !== ($file = $skinDir->read())) {
+			while( false !== ( $file = $skinDir->read() ) ) {
 				// Skip non-PHP files, hidden files, and '.dep' includes
 				$matches = array();
-				if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
+				if( preg_match( '/^([^.]*)\.php$/', $file, $matches ) ) {
 					$aSkin = $matches[1];
 					$wgValidSkinNames[strtolower($aSkin)] = $aSkin;
 				}
@@ -60,7 +62,7 @@ class Skin extends Linker {
 		}
 		return $wgValidSkinNames;
 	}
-	
+
 	/**
 	 * Fetch the list of usable skins in regards to $wgSkipSkins.
 	 * Useful for Special:Preferences and other places where you
@@ -196,7 +198,7 @@ class Skin extends Linker {
 			'title' => wfMsgForContent( 'opensearch-desc' ),
 		));
 
-		$this->addMetadataLinks($out);
+		$this->addMetadataLinks( $out );
 
 		$this->mRevisionId = $out->mRevisionId;
 
@@ -209,18 +211,18 @@ class Skin extends Linker {
 	 * Preload the existence of three commonly-requested pages in a single query
 	 */
 	function preloadExistence() {
-		global $wgUser, $wgTitle;
+		global $wgUser;
 
 		// User/talk link
 		$titles = array( $wgUser->getUserPage(), $wgUser->getTalkPage() );
 
 		// Other tab link
-		if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+		if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
 			// nothing
-		} elseif ( $wgTitle->isTalkPage() ) {
-			$titles[] = $wgTitle->getSubjectPage();
+		} elseif ( $this->mTitle->isTalkPage() ) {
+			$titles[] = $this->mTitle->getSubjectPage();
 		} else {
-			$titles[] = $wgTitle->getTalkPage();
+			$titles[] = $this->mTitle->getTalkPage();
 		}
 
 		$lb = new LinkBatch( $titles );
@@ -228,7 +230,7 @@ class Skin extends Linker {
 	}
 
 	function addMetadataLinks( OutputPage $out ) {
-		global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
+		global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
 		global $wgRightsPage, $wgRightsUrl;
 
 		if( $out->isArticleRelated() ) {
@@ -237,13 +239,15 @@ class Skin extends Linker {
 				$out->addMetadataLink( array(
 					'title' => 'Creative Commons',
 					'type' => 'application/rdf+xml',
-					'href' => $wgTitle->getLocalURL( 'action=creativecommons') ) );
+					'href' => $this->mTitle->getLocalURL( 'action=creativecommons' ) )
+				);
 			}
 			if( $wgEnableDublinCoreRdf ) {
 				$out->addMetadataLink( array(
 					'title' => 'Dublin Core',
 					'type' => 'application/rdf+xml',
-					'href' => $wgTitle->getLocalURL( 'action=dublincore' ) ) );
+					'href' => $this->mTitle->getLocalURL( 'action=dublincore' ) )
+				);
 			}
 		}
 		$copyright = '';
@@ -259,18 +263,34 @@ class Skin extends Linker {
 		if( $copyright ) {
 			$out->addLink( array(
 				'rel' => 'copyright',
-				'href' => $copyright ) );
+				'href' => $copyright )
+			);
 		}
 	}
 
-	function setMembers(){
-		global $wgTitle, $wgUser;
-		$this->mTitle = $wgTitle;
+	/**
+	 * Set some local variables
+	 */
+	protected function setMembers(){
+		global $wgUser;
 		$this->mUser = $wgUser;
 		$this->userpage = $wgUser->getUserPage()->getPrefixedText();
 		$this->usercss = false;
 	}
 
+	/**
+	 * Set the title
+	 * @param Title $t The title to use
+	 */
+	public function setTitle( $t ) {
+		$this->mTitle = $t;
+	}
+
+	/** Get the title */
+	public function getTitle() {
+		return $this->mTitle;
+	}
+
 	function outputPage( OutputPage $out ) {
 		global $wgDebugComments;
 		wfProfileIn( __METHOD__ );
@@ -299,7 +319,7 @@ class Skin extends Linker {
 		$out->out( $out->mBodytext . "\n" );
 
 		$out->out( $this->afterContent() );
-		
+
 		$out->out( $afterContent );
 
 		$out->out( $this->bottomScripts() );
@@ -311,36 +331,42 @@ class Skin extends Linker {
 	}
 
 	static function makeVariablesScript( $data ) {
-		global $wgJsMimeType;
-
-		$r = array( "<script type= \"$wgJsMimeType\">/*<![CDATA[*/" );
-		foreach ( $data as $name => $value ) {
-			$encValue = Xml::encodeJsVar( $value );
-			$r[] = "var $name = $encValue;";
+		if( $data ) {
+			$r = array();
+			foreach ( $data as $name => $value ) {
+				$encValue = Xml::encodeJsVar( $value );
+				$r[] = "$name=$encValue";
+			}
+			$js = 'var ' . implode( ",\n", $r ) . ';';
+			return Html::inlineScript( "\n$js\n" );
+		} else {
+			return '';
 		}
-		$r[] = "/*]]>*/</script>\n";
-
-		return implode( "\n\t\t", $r );
 	}
 
 	/**
 	 * Make a <script> tag containing global variables
-	 * @param array $data Associative array containing one element:
-	 *     skinname => the skin name
+	 * @param $skinName string Name of the skin
 	 * The odd calling convention is for backwards compatibility
+	 * @TODO @FIXME Make this not depend on $wgTitle!
 	 */
-	static function makeGlobalVariablesScript( $data ) {
-		global $wgScript, $wgStylePath, $wgUser;
+	static function makeGlobalVariablesScript( $skinName ) {
+		if ( is_array( $skinName ) ) {
+			# Weird back-compat stuff.
+			$skinName = $skinName['skinname'];
+		}
+		global $wgScript, $wgTitle, $wgStylePath, $wgUser, $wgScriptExtension;
 		global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
-		global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
+		global $wgOut, $wgArticle;
 		global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
 		global $wgUseAjax, $wgAjaxWatch;
 		global $wgVersion, $wgEnableAPI, $wgEnableWriteAPI;
 		global $wgRestrictionTypes, $wgLivePreview;
 		global $wgMWSuggestTemplate, $wgDBname, $wgEnableMWSuggest;
+		global $wgSitename, $wgEnableIframeApiProxy, $wgEnableJS2system;
 
 		$ns = $wgTitle->getNamespace();
-		$nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
+		$nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText();
 		$separatorTransTable = $wgContLang->separatorTransformTable();
 		$separatorTransTable = $separatorTransTable ? $separatorTransTable : array();
 		$compactSeparatorTransTable = array(
@@ -354,17 +380,21 @@ class Skin extends Linker {
 			implode( "\t", $digitTransTable ),
 		);
 
+		$mainPage = Title::newFromText( wfMsgForContent( 'mainpage' ) );
 		$vars = array(
-			'skin' => $data['skinname'],
+			'skin' => $skinName,
 			'stylepath' => $wgStylePath,
+			'urlprotocols' => wfUrlProtocols(),
 			'wgArticlePath' => $wgArticlePath,
 			'wgScriptPath' => $wgScriptPath,
+			'wgScriptExtension' => $wgScriptExtension,
 			'wgScript' => $wgScript,
 			'wgVariantArticlePath' => $wgVariantArticlePath,
 			'wgActionPaths' => (object)$wgActionPaths,
 			'wgServer' => $wgServer,
 			'wgCanonicalNamespace' => $nsname,
-			'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBkey() ),
+			'wgCanonicalSpecialPageName' => $ns == NS_SPECIAL ?
+				SpecialPage::resolveAlias( $wgTitle->getDBkey() ) : false, # bug 21115
 			'wgNamespaceNumber' => $wgTitle->getNamespace(),
 			'wgPageName' => $wgTitle->getPrefixedDBKey(),
 			'wgTitle' => $wgTitle->getText(),
@@ -382,13 +412,27 @@ class Skin extends Linker {
 			'wgEnableWriteAPI' => $wgEnableWriteAPI,
 			'wgSeparatorTransformTable' => $compactSeparatorTransTable,
 			'wgDigitTransformTable' => $compactDigitTransTable,
+			'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
+			'wgFormattedNamespaces' => $wgContLang->getFormattedNamespaces(),
+			'wgNamespaceIds' => $wgContLang->getNamespaceIds(),
+			'wgSiteName' => $wgSitename,
 		);
-		
-		if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false )){
+		if ( $wgContLang->hasVariants() ) {
+			$vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
+		}
+
+		//if on upload page output the extension list & js_upload
+		if( SpecialPage::resolveAlias( $wgTitle->getDBkey() ) ==  "Upload" ) {
+			global $wgFileExtensions, $wgAjaxUploadInterface;
+			$vars['wgFileExtensions'] = $wgFileExtensions;
+			$vars['wgAjaxUploadInterface'] = $wgAjaxUploadInterface;
+		}
+
+		if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){
 			$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
 			$vars['wgDBname'] = $wgDBname;
 			$vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $wgUser );
-			$vars['wgMWSuggestMessages'] = array( wfMsg('search-mwsuggest-enabled'), wfMsg('search-mwsuggest-disabled'));
+			$vars['wgMWSuggestMessages'] = array( wfMsg( 'search-mwsuggest-enabled' ), wfMsg( 'search-mwsuggest-disabled' ) );
 		}
 
 		foreach( $wgRestrictionTypes as $type )
@@ -401,7 +445,18 @@ class Skin extends Linker {
 			$vars['wgLivepreviewMessageError']   = wfMsg( 'livepreview-error' );
 		}
 
-		if($wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
+		//add api proxy var and script link if on the special proxy page:
+		if( $wgEnableJS2system &&
+			$wgTitle->getNamespace() == NS_MEDIAWIKI &&
+			$wgTitle->getDBKey() == 'ApiProxy' )
+		{
+			$vars['wgEnableIframeApiProxy'] = $wgEnableIframeApiProxy;			
+			//also add the apiProxy Page script if we are on that page
+			if( $wgEnableIframeApiProxy )
+				$wgOut->addScriptClass( 'apiProxyPage' );
+		}
+
+		if ( $wgOut->isArticleRelated() && $wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
 			$msgs = (object)array();
 			foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching' ) as $msgName ) {
 				$msgs->{$msgName . 'Msg'} = wfMsg( $msgName );
@@ -409,36 +464,12 @@ class Skin extends Linker {
 			$vars['wgAjaxWatch'] = $msgs;
 		}
 
-		wfRunHooks('MakeGlobalVariablesScript', array(&$vars));
+		// Allow extensions to add their custom variables to the global JS variables
+		wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
 
 		return self::makeVariablesScript( $vars );
 	}
 
-	function getHeadScripts( $allowUserJs ) {
-		global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
-
-		$vars = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
-
-		$r = array( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>" );
-		global $wgUseSiteJs;
-		if ($wgUseSiteJs) {
-			$jsCache = $wgUser->isLoggedIn() ? '&smaxage=0' : '';
-			$r[] = "<script type=\"$wgJsMimeType\" src=\"".
-				htmlspecialchars(self::makeUrl('-',
-					"action=raw$jsCache&gen=js&useskin=" .
-					urlencode( $this->getSkinName() ) ) ) .
-				"\"><!-- site js --></script>";
-		}
-		if( $allowUserJs && $wgUser->isLoggedIn() ) {
-			$userpage = $wgUser->getUserPage();
-			$userjs = htmlspecialchars( self::makeUrl(
-				$userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
-				'action=raw&ctype='.$wgJsMimeType));
-			$r[] = '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>";
-		}
-		return $vars . "\t\t" . implode ( "\n\t\t", $r );
-	}
-
 	/**
 	 * To make it harder for someone to slip a user a fake
 	 * user-JavaScript or user-CSS preview, a random token
@@ -448,16 +479,17 @@ class Skin extends Linker {
 	 *
 	 * @param string $action
 	 * @return bool
-	 * @private
 	 */
-	function userCanPreview( $action ) {
-		global $wgTitle, $wgRequest, $wgUser;
+	public function userCanPreview( $action ) {
+		global $wgRequest, $wgUser;
 
 		if( $action != 'submit' )
 			return false;
 		if( !$wgRequest->wasPosted() )
 			return false;
-		if( !$wgTitle->userCanEditCssJsSubpage() )
+		if( !$this->mTitle->userCanEditCssSubpage() )
+			return false;
+		if( !$this->mTitle->userCanEditJsSubpage() )
 			return false;
 		return $wgUser->matchEditToken(
 			$wgRequest->getVal( 'wpEditToken' ) );
@@ -474,27 +506,32 @@ class Skin extends Linker {
 	 * top.  For now Monobook.js will be maintained, but it should be consi-
 	 * dered deprecated.
 	 *
+	 * @param $force_skin string If set, overrides the skin name
+	 *
 	 * @return string
 	 */
-	public function generateUserJs() {
+	public function generateUserJs( $skinName = null ) {
 		global $wgStylePath;
 
 		wfProfileIn( __METHOD__ );
+		if( !$skinName ) {
+			$skinName =	$this->getSkinName();
+		}
 
 		$s = "/* generated javascript */\n";
-		$s .= "var skin = '" . Xml::escapeJsString( $this->getSkinName() ) . "';\n";
+		$s .= "var skin = '" . Xml::escapeJsString($skinName ) . "';\n";
 		$s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
 		$s .= "\n\n/* MediaWiki:Common.js */\n";
-		$commonJs = wfMsgForContent('common.js');
-		if ( !wfEmptyMsg ( 'common.js', $commonJs ) ) {
+		$commonJs = wfMsgForContent( 'common.js' );
+		if ( !wfEmptyMsg( 'common.js', $commonJs ) ) {
 			$s .= $commonJs;
 		}
 
-		$s .= "\n\n/* MediaWiki:".ucfirst( $this->getSkinName() ).".js */\n";
+		$s .= "\n\n/* MediaWiki:".ucfirst( $skinName ).".js */\n";
 		// avoid inclusion of non defined user JavaScript (with custom skins only)
 		// by checking for default message content
-		$msgKey = ucfirst( $this->getSkinName() ).'.js';
-		$userJS = wfMsgForContent($msgKey);
+		$msgKey = ucfirst( $skinName ) . '.js';
+		$userJS = wfMsgForContent( $msgKey );
 		if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
 			$s .= $userJS;
 		}
@@ -504,7 +541,7 @@ class Skin extends Linker {
 	}
 
 	/**
-	 * generate user stylesheet for action=raw&gen=css
+	 * Generate user stylesheet for action=raw&gen=css
 	 */
 	public function generateUserStylesheet() {
 		wfProfileIn( __METHOD__ );
@@ -513,14 +550,14 @@ class Skin extends Linker {
 		wfProfileOut( __METHOD__ );
 		return $s;
 	}
-	
+
 	/**
 	 * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
 	 */
 	protected function reallyGenerateUserStylesheet(){
 		global $wgUser;
 		$s = '';
-		if (($undopt = $wgUser->getOption("underline")) < 2) {
+		if( ( $undopt = $wgUser->getOption( 'underline' ) ) < 2 ) {
 			$underline = $undopt ? 'underline' : 'none';
 			$s .= "a { text-decoration: $underline; }\n";
 		}
@@ -551,6 +588,10 @@ END;
 		if( !$wgUser->getOption( 'editsection' ) ) {
 			$s .= ".editsection { display: none; }\n";
 		}
+		$fontstyle = $wgUser->getOption( 'editfont' );
+		if ( $fontstyle !== 'default' ) {
+			$s .= "textarea { font-family: $fontstyle; }\n";
+		}
 		return $s;
 	}
 
@@ -571,8 +612,8 @@ END;
 		);
 
 		// Add any extension CSS
-		foreach( $out->getExtStyle() as $tag ) {
-			$out->addStyle( $tag['href'] );
+		foreach ( $out->getExtStyle() as $url ) {
+			$out->addStyle( $url );
 		}
 
 		// If we use the site's dynamic CSS, throw that in, too
@@ -608,14 +649,13 @@ END;
 
 		// Per-user custom style pages
 		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) {
-			$action = $wgRequest->getVal('action');
+			$action = $wgRequest->getVal( 'action' );
 			# If we're previewing the CSS page, use it
 			if( $this->mTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
-				$previewCss = $wgRequest->getText('wpTextbox1');
 				// @FIXME: properly escape the cdata!
-				$this->usercss = "/*<![CDATA[*/\n" . $previewCss . "/*]]>*/";
+				$out->addInlineStyle( $wgRequest->getText( 'wpTextbox1' ) );
 			} else {
-				$out->addStyle( self::makeUrl($this->userpage . '/' . $this->getSkinName() .'.css',
+				$out->addStyle( self::makeUrl( $this->userpage . '/' . $this->getSkinName() .'.css',
 					'action=raw&ctype=text/css' ) );
 			}
 		}
@@ -635,38 +675,37 @@ END;
 	}
 
 	function getBodyOptions() {
-		global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
+		global $wgUser, $wgOut, $wgRequest, $wgContLang;
 
 		extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
 
-		if ( 0 != $wgTitle->getNamespace() ) {
+		if ( 0 != $this->mTitle->getNamespace() ) {
 			$a = array( 'bgcolor' => '#ffffec' );
 		}
 		else $a = array( 'bgcolor' => '#FFFFFF' );
-		if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
-		  $wgTitle->quickUserCan( 'edit' ) ) {
-			$s = $wgTitle->getFullURL( $this->editUrlOptions() );
+		if( $wgOut->isArticle() && $wgUser->getOption( 'editondblclick' ) &&
+		  $this->mTitle->quickUserCan( 'edit' ) ) {
+			$s = $this->mTitle->getFullURL( $this->editUrlOptions() );
 			$s = 'document.location = "' .Xml::escapeJsString( $s ) .'";';
-			$a += array ('ondblclick' => $s);
-
+			$a += array( 'ondblclick' => $s );
 		}
 		$a['onload'] = $wgOut->getOnloadHandler();
 		$a['class'] =
 			'mediawiki' .
-			' '.( $wgContLang->isRTL() ? "rtl" : "ltr" ).
-			' '.$this->getPageClasses( $wgTitle ) .
-			' skin-'. Sanitizer::escapeClass( $this->getSkinName( ) );
+			' '.( $wgContLang->getDir() ).
+			' '.$this->getPageClasses( $this->mTitle ) .
+			' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
 		return $a;
 	}
-	
+
 	function getPageClasses( $title ) {
 		$numeric = 'ns-'.$title->getNamespace();
 		if( $title->getNamespace() == NS_SPECIAL ) {
-			$type = "ns-special";
+			$type = 'ns-special';
 		} elseif( $title->isTalkPage() ) {
-			$type = "ns-talk";
+			$type = 'ns-talk';
 		} else {
-			$type = "ns-subject";
+			$type = 'ns-subject';
 		}
 		$name = Sanitizer::escapeClass( 'page-'.$title->getPrefixedText() );
 		return "$numeric $type $name";
@@ -690,8 +729,7 @@ END;
 
 	function doBeforeContent() {
 		global $wgContLang;
-		$fname = 'Skin::doBeforeContent';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$s = '';
 		$qb = $this->qbSetting();
@@ -718,13 +756,13 @@ END;
 		} elseif( $left ) {
 			$s .= $this->getQuickbarCompensator( $rows );
 		}
-		$l = $wgContLang->isRTL() ? 'right' : 'left';
+		$l = $wgContLang->alignStart();
 		$s .= "<td {$borderhack} align='$l' valign='top'>\n";
 
-		$s .= $this->topLinks() ;
+		$s .= $this->topLinks();
 		$s .= "<p class='subtitle'>" . $this->pageTitleLinks() . "</p>\n";
 
-		$r = $wgContLang->isRTL() ? "left" : "right";
+		$r = $wgContLang->alignEnd();
 		$s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
 		$s .= $this->nameAndLogin();
 		$s .= "\n<br />" . $this->searchForm() . "</td>";
@@ -744,25 +782,25 @@ END;
 			$s .= "\n<div id='siteNotice'>$notice</div>\n";
 		}
 		$s .= $this->pageTitle();
-		$s .= $this->pageSubtitle() ;
+		$s .= $this->pageSubtitle();
 		$s .= $this->getCategories();
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $s;
 	}
 
 
 	function getCategoryLinks() {
-		global $wgOut, $wgTitle, $wgUseCategoryBrowser;
+		global $wgOut, $wgUseCategoryBrowser;
 		global $wgContLang, $wgUser;
 
 		if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
 
 		# Separator
-		$sep = wfMsgHtml( 'catseparator' );
+		$sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities' ) );
 
 		// Use Unicode bidi embedding override characters,
 		// to make sure links don't smash each other up in ugly ways.
-		$dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+		$dir = $wgContLang->getDir();
 		$embed = "<span dir='$dir'>";
 		$pop = '</span>';
 
@@ -770,11 +808,11 @@ END;
 		$s = '';
 		$colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 		if ( !empty( $allCats['normal'] ) ) {
-			$t = $embed . implode ( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
+			$t = $embed . implode( "{$pop} {$sep} {$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 )
+				$this->link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
 				. $colon . $t . '</div>';
 		}
 
@@ -782,7 +820,7 @@ END;
 		if ( isset( $allCats['hidden'] ) ) {
 			if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
 				$class ='mw-hidden-cats-user-shown';
-			} elseif ( $wgTitle->getNamespace() == NS_CATEGORY ) {
+			} elseif ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
 				$class = 'mw-hidden-cats-ns-shown';
 			} else {
 				$class = 'mw-hidden-cats-hidden';
@@ -799,55 +837,59 @@ END;
 			$s .= '<br /><hr />';
 
 			# get a big array of the parents tree
-			$parenttree = $wgTitle->getParentCategoryTree();
+			$parenttree = $this->mTitle->getParentCategoryTree();
 			# Skin object passed by reference cause it can not be
 			# accessed under the method subfunction drawCategoryBrowser
-			$tempout = explode("\n", Skin::drawCategoryBrowser($parenttree, $this) );
+			$tempout = explode( "\n", Skin::drawCategoryBrowser( $parenttree, $this ) );
 			# Clean out bogus first entry and sort them
-			unset($tempout[0]);
-			asort($tempout);
+			unset( $tempout[0] );
+			asort( $tempout );
 			# Output one per line
-			$s .= implode("<br />\n", $tempout);
+			$s .= implode( "<br />\n", $tempout );
 		}
 
 		return $s;
 	}
 
-	/** Render the array as a serie of links.
+	/**
+	 * 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 ){
 		$return = '';
-		foreach ($tree as $element => $parent) {
-			if (empty($parent)) {
+		foreach( $tree as $element => $parent ) {
+			if( empty( $parent ) ) {
 				# element start a new list
 				$return .= "\n";
 			} else {
 				# grab the others elements
-				$return .= Skin::drawCategoryBrowser($parent, $skin) . ' &gt; ';
+				$return .= Skin::drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
 			}
 			# add our current element to the list
-			$eltitle = Title::newFromText($element);
-			$return .=  $skin->link( $eltitle, $eltitle->getText() ) ;
+			$eltitle = Title::newFromText( $element );
+			$return .=  $skin->link( $eltitle, $eltitle->getText() );
 		}
 		return $return;
 	}
 
 	function getCategories() {
-		$catlinks=$this->getCategoryLinks();
+		$catlinks = $this->getCategoryLinks();
 
 		$classes = 'catlinks';
 
-		if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false &&
-			strpos( $catlinks, '<div id="mw-hidden-catlinks" class="mw-hidden-cats-hidden">' ) !== false ) {
+		// Check what we're showing
+		global $wgOut, $wgUser;
+		$allCats = $wgOut->getCategoryLinks();
+		$showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
+						$this->mTitle->getNamespace() == NS_CATEGORY;
+
+		if( empty($allCats['normal']) && !( !empty($allCats['hidden']) && $showHidden ) ) {
 			$classes .= ' catlinks-allhidden';
 		}
 
-		if( !empty( $catlinks ) ){
-			return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
-		}
+		return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
 	}
 
 	function getQuickbarCompensator( $rows = 1 ) {
@@ -869,7 +911,7 @@ END;
 	 * Returns an empty string by default, if not changed by any hook function.
 	 */
 	protected function afterContentHook() {
-		$data = "";
+		$data = '';
 
 		if( wfRunHooks( 'SkinAfterContent', array( &$data ) ) ){
 			// adding just some spaces shouldn't toggle the output
@@ -889,13 +931,63 @@ END;
 		return $data;
 	}
 
+	/**
+	 * Generate debug data HTML for displaying at the bottom of the main content
+	 * area.
+	 * @return String HTML containing debug data, if enabled (otherwise empty).
+	 */
+	protected function generateDebugHTML() {
+		global $wgShowDebug, $wgOut;
+		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 . "</ul>\n";
+		}
+		return '';
+	}
+
+	private function formatDebugHTML( $debugText ) {
+		$lines = explode( "\n", $debugText );
+		$curIdent = 0;
+		$ret = '<li>';
+		foreach( $lines as $line ) {
+			$m = array();
+			$display = ltrim( $line );
+			$ident = strlen( $line ) - strlen( $display );
+			$diff = $ident - $curIdent;
+
+			if ( $display == '' )
+				$display = "\xc2\xa0";
+
+			if ( !$ident && $diff < 0 && substr( $display, 0, 9 ) != 'Entering ' && substr( $display, 0, 8 ) != 'Exiting ' ) {
+				$ident = $curIdent;
+				$diff = 0;
+				$display = '<span style="background:yellow;">' . htmlspecialchars( $display ) . '</span>';
+			} else {
+				$display = htmlspecialchars( $display );
+			}
+
+			if ( $diff < 0 )
+				$ret .= str_repeat( "</li></ul>\n", -$diff ) . "</li><li>\n";
+			elseif ( $diff == 0 )
+				$ret .= "</li><li>\n";
+			else
+				$ret .= str_repeat( "<ul><li>\n", $diff );
+			$ret .= $display . "\n";
+
+			$curIdent = $ident;
+		}
+		$ret .= str_repeat( '</li></ul>', $curIdent ) . '</li>';
+		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->doAfterContent();
+		return $printfooter . $this->generateDebugHTML() . $this->doAfterContent();
 	}
 
 	/**
@@ -903,117 +995,143 @@ END;
 	 * @return String HTML-wrapped JS code to be put before </body>
 	 */
 	function bottomScripts() {
-		global $wgJsMimeType;
-		$bottomScriptText = "\n\t\t<script type=\"$wgJsMimeType\">if (window.runOnloadHook) runOnloadHook();</script>\n";
+		$bottomScriptText = "\n" . Html::inlineScript( 'if (window.runOnloadHook) runOnloadHook();' ) . "\n";
 		wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
 		return $bottomScriptText;
 	}
 
 	/** @return string Retrievied from HTML text */
 	function printSource() {
-		global $wgTitle;
-		$url = htmlspecialchars( $wgTitle->getFullURL() );
+		$url = htmlspecialchars( $this->mTitle->getFullURL() );
 		return wfMsg( 'retrievedfrom', '<a href="'.$url.'">'.$url.'</a>' );
 	}
 
 	function printFooter() {
-		global $wgArticle;
-		// Under certain conditions, $wgArticle might not be an object which would cause a fatal error like this:
-		// Fatal error: Call to a member function getID() on a non-object in ../includes/Skin.php on line 1270
-		// To prevent this, we'll check first if $wgArticle is an object and if that's the case, then we'll load the page stats.
-		$stats = ( is_object( $wgArticle ) ? "<p>" . $this->pageStats() . "</p>\n" : '' );
 		return "<p>" .  $this->printSource() .
-			"</p>\n\n" . $stats;
+			"</p>\n\n<p>" . $this->pageStats() . "</p>\n";
 	}
 
 	/** overloaded by derived classes */
-	function doAfterContent() { return "</div></div>"; }
+	function doAfterContent() { return '</div></div>'; }
 
 	function pageTitleLinks() {
-		global $wgOut, $wgTitle, $wgUser, $wgRequest;
+		global $wgOut, $wgUser, $wgRequest, $wgLang;
 
 		$oldid = $wgRequest->getVal( 'oldid' );
 		$diff = $wgRequest->getVal( 'diff' );
 		$action = $wgRequest->getText( 'action' );
 
-		$s = $this->printableLink();
+		$s[] = $this->printableLink();
 		$disclaimer = $this->disclaimerLink(); # may be empty
 		if( $disclaimer ) {
-			$s .= ' | ' . $disclaimer;
+			$s[] = $disclaimer;
 		}
 		$privacy = $this->privacyLink(); # may be empty too
 		if( $privacy ) {
-			$s .= ' | ' . $privacy;
+			$s[] = $privacy;
 		}
 
 		if ( $wgOut->isArticleRelated() ) {
-			if ( $wgTitle->getNamespace() == NS_FILE ) {
-				$name = $wgTitle->getDBkey();
-				$image = wfFindFile( $wgTitle );
+			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>";
+					$s[] = "<a href=\"{$link}\"{$style}>{$name}</a>";
 				}
 			}
 		}
 		if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-			$s .= ' | ' . $this->makeKnownLinkObj( $wgTitle,
-					wfMsg( 'currentrev' ) );
+			$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( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
-				$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
-				$dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
-				$s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
+			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);
+				$wgOut->setSquidMaxage( 0 );
+				$wgOut->enableClientCache( false );
 			}
 		}
 
 		$undelete = $this->getUndeleteLink();
 		if( !empty( $undelete ) ) {
-			$s .= ' | '.$undelete;
+			$s[] = $undelete;
 		}
-		return $s;
+		return $wgLang->pipeList( $s );
 	}
 
 	function getUndeleteLink() {
-		global $wgUser, $wgTitle, $wgContLang, $wgLang, $action;
-		if(	$wgUser->isAllowed( 'deletedhistory' ) &&
-			(($wgTitle->getArticleId() == 0) || ($action == "history")) &&
-			($n = $wgTitle->isDeleted() ) )
-		{
-			if ( $wgUser->isAllowed( 'undelete' ) ) {
-				$msg = 'thisisdeleted';
-			} else {
-				$msg = 'viewdeleted';
+		global $wgUser, $wgContLang, $wgLang, $wgRequest;
+
+		$action = $wgRequest->getVal( 'action', 'view' );
+
+		if ( $wgUser->isAllowed( 'deletedhistory' ) &&
+			( $this->mTitle->getArticleId() == 0 || $action == 'history' ) ) {
+			$n = $this->mTitle->isDeleted();
+			if ( $n ) {
+				if ( $wgUser->isAllowed( 'undelete' ) ) {
+					$msg = 'thisisdeleted';
+				} else {
+					$msg = 'viewdeleted';
+				}
+				return wfMsg(
+					$msg,
+					$this->link(
+						SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
+						wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ),
+						array(),
+						array(),
+						array( 'known', 'noclasses' )
+					)
+				);
 			}
-			return wfMsg( $msg,
-				$this->makeKnownLinkObj(
-					SpecialPage::getTitleFor( 'Undelete', $wgTitle->getPrefixedDBkey() ),
-					wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ) ) );
 		}
 		return '';
 	}
 
 	function printableLink() {
-		global $wgOut, $wgFeedClasses, $wgRequest;
+		global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
+
+		$s = array();
 
-		$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+		if ( !$wgOut->isPrintable() ) {
+			$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+			$s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
+		}
 
-		$s = "<a href=\"$printurl\">" . wfMsg( 'printableversion' ) . '</a>';
 		if( $wgOut->isSyndicated() ) {
 			foreach( $wgFeedClasses as $format => $class ) {
 				$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
-				$s .= " | <a href=\"$feedurl\">{$format}</a>";
+				$s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
+						. " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>";
 			}
 		}
-		return $s;
+		return $wgLang->pipeList( $s );
 	}
 
 	function pageTitle() {
@@ -1031,34 +1149,40 @@ END;
 			$sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
 		}
 		$subpages = $this->subPageSubtitle();
-		$sub .= !empty($subpages)?"</p><p class='subpages'>$subpages":'';
+		$sub .= !empty( $subpages ) ? "</p><p class='subpages'>$subpages" : '';
 		$s = "<p class='subtitle'>{$sub}</p>\n";
 		return $s;
 	}
 
 	function subPageSubtitle() {
 		$subpages = '';
-		if(!wfRunHooks('SkinSubPageSubtitle', array(&$subpages)))
+		if( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) )
 			return $subpages;
 
-		global $wgOut, $wgTitle;
-		if($wgOut->isArticle() && MWNamespace::hasSubpages( $wgTitle->getNamespace() )) {
-			$ptext=$wgTitle->getPrefixedText();
-			if(preg_match('/\//',$ptext)) {
-				$links = explode('/',$ptext);
+		global $wgOut;
+		if( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
+			$ptext = $this->mTitle->getPrefixedText();
+			if( preg_match( '/\//', $ptext ) ) {
+				$links = explode( '/', $ptext );
 				array_pop( $links );
 				$c = 0;
 				$growinglink = '';
 				$display = '';
-				foreach($links as $link) {
+				foreach( $links as $link ) {
 					$growinglink .= $link;
 					$display .= $link;
 					$linkObj = Title::newFromText( $growinglink );
 					if( is_object( $linkObj ) && $linkObj->exists() ){
-						$getlink = $this->makeKnownLinkObj( $linkObj, htmlspecialchars( $display ) );
+						$getlink = $this->link(
+							$linkObj,
+							htmlspecialchars( $display ),
+							array(),
+							array(),
+							array( 'known', 'noclasses' )
+						);
 						$c++;
-						if ($c>1) {
-							$subpages .= ' | ';
+						if( $c > 1 ) {
+							$subpages .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
 						} else  {
 							$subpages .= '&lt; ';
 						}
@@ -1083,7 +1207,7 @@ END;
 	}
 
 	function nameAndLogin() {
-		global $wgUser, $wgTitle, $wgLang, $wgContLang;
+		global $wgUser, $wgLang, $wgContLang;
 
 		$logoutPage = $wgContLang->specialPage( 'Userlogout' );
 
@@ -1100,7 +1224,7 @@ END;
 				$ret .= wfMsg( 'notloggedin' );
 			}
 
-			$returnTo = $wgTitle->getPrefixedDBkey();
+			$returnTo = $this->mTitle->getPrefixedDBkey();
 			$query = array();
 			if ( $logoutPage != $returnTo ) {
 				$query['returnto'] = $returnTo;
@@ -1114,23 +1238,28 @@ END;
 				wfMsg( $loginlink ), array(), $query
 			);
 		} else {
-			$returnTo = $wgTitle->getPrefixedDBkey();
+			$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 .= $this->link(
-				SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
-				array(), array( 'returnto' => $returnTo )
-			);
-			$ret .= ' | ' . $this->specialLink( 'preferences' );
-		}
-		$ret .= ' | ' . $this->link(
-			Title::newFromText( wfMsgForContent( 'helppage' ) ),
-			wfMsg( 'help' )
-		);
+			$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;
 	}
@@ -1145,37 +1274,53 @@ END;
 	}
 
 	function searchForm() {
-		global $wgRequest;
+		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') . '" />&nbsp;'
-		  . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
+		  . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />\n"
+		  . '<input type="submit" name="go" value="' . wfMsg( 'searcharticle' ) . '" />';
+
+		if( $wgUseTwoButtonsSearchForm )
+			$s .= '&nbsp;<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;
-		$sep = " |\n";
 
-		$s = $this->mainPageLink();
+		$s = array(
+			$this->mainPageLink(),
+			$this->specialLink( 'recentchanges' )
+		);
 
 		if ( $wgOut->isArticleRelated() ) {
-			$s .=  $sep . $this->editThisPage() . $sep . $this->historyLink();
+			$s[] = $this->editThisPage();
+			$s[] = $this->historyLink();
 		}
+		# Many people don't like this dropdown box
+		#$s[] = $this->specialPagesList();
 
-		$s .= $this->variantLinks();
+		if( $this->variantLinks() ) {
+			$s[] = $this->variantLinks();
+		}
 
-		$s .= $this->extensionTabLinks();
+		if( $this->extensionTabLinks() ) {
+			$s[] = $this->extensionTabLinks();
+		}
 
-		return $s;
+		// FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline
+		return implode( $s, wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n" );
 	}
 
 	/**
@@ -1186,14 +1331,23 @@ END;
 	 */
 	function extensionTabLinks() {
 		$tabs = array();
-		$s = '';
+		$out = '';
+		$s = array();
 		wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
 		foreach( $tabs as $tab ) {
-			$s .= ' | ' . Xml::element( 'a',
+			$s[] = Xml::element( 'a',
 				array( 'href' => $tab['href'] ),
 				$tab['text'] );
 		}
-		return $s;
+
+		if( count( $s ) ) {
+			global $wgLang;
+
+			$out = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
+			$out .= $wgLang->pipeList( $s );
+		}
+
+		return $out;
 	}
 
 	/**
@@ -1203,69 +1357,75 @@ END;
 	function variantLinks() {
 		$s = '';
 		/* show links to different language variants */
-		global $wgDisableLangConversion, $wgContLang, $wgTitle;
+		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 .= ' | <a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>';
+				$s = $wgLang->pipeList( array(
+					$s,
+					'<a href="' . $this->mTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
+				) );
 			}
 		}
 		return $s;
 	}
 
 	function bottomLinks() {
-		global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks;
-		$sep = " |\n";
+		global $wgOut, $wgUser, $wgUseTrackbacks;
+		$sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n";
 
 		$s = '';
 		if ( $wgOut->isArticleRelated() ) {
-			$s .= '<strong>' . $this->editThisPage() . '</strong>';
+			$element[] = '<strong>' . $this->editThisPage() . '</strong>';
 			if ( $wgUser->isLoggedIn() ) {
-				$s .= $sep . $this->watchThisPage();
+				$element[] = $this->watchThisPage();
 			}
-			$s .= $sep . $this->talkLink()
-			  . $sep . $this->historyLink()
-			  . $sep . $this->whatLinksHere()
-			  . $sep . $this->watchPageLinksLink();
-
-			if ($wgUseTrackbacks)
-				$s .= $sep . $this->trackbackLink();
+			$element[] = $this->talkLink();
+			$element[] = $this->historyLink();
+			$element[] = $this->whatLinksHere();
+			$element[] = $this->watchPageLinksLink();
 
-			if ( $wgTitle->getNamespace() == NS_USER
-			    || $wgTitle->getNamespace() == NS_USER_TALK )
+			if( $wgUseTrackbacks )
+				$element[] = $this->trackbackLink();
 
-			{
-				$id=User::idFromName($wgTitle->getText());
-				$ip=User::isIP($wgTitle->getText());
+			if ( $this->mTitle->getNamespace() == NS_USER
+			    || $this->mTitle->getNamespace() == NS_USER_TALK ){
+				$id = User::idFromName( $this->mTitle->getText() );
+				$ip = User::isIP( $this->mTitle->getText() );
 
-				if($id || $ip) { # both anons and non-anons have contri list
-					$s .= $sep . $this->userContribsLink();
+				if( $id || $ip ) { # both anons and non-anons have contri list
+					$element[] = $this->userContribsLink();
 				}
 				if( $this->showEmailUser( $id ) ) {
-					$s .= $sep . $this->emailUserLink();
+					$element[] = $this->emailUserLink();
 				}
 			}
-			if ( $wgTitle->getArticleId() ) {
+
+			$s = implode( $element, $sep );
+
+			if ( $this->mTitle->getArticleId() ) {
 				$s .= "\n<br />";
-				if($wgUser->isAllowed('delete')) { $s .= $this->deleteThisPage(); }
-				if($wgUser->isAllowed('protect')) { $s .= $sep . $this->protectThisPage(); }
-				if($wgUser->isAllowed('move')) { $s .= $sep . $this->moveThisPage(); }
+				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, $wgTitle, $wgPageShowWatchingUsers;
+		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 ''; }
 
@@ -1285,15 +1445,15 @@ END;
 
 		if( $wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ) ) {
 			$dbr = wfGetDB( DB_SLAVE );
-			$watchlist = $dbr->tableName( 'watchlist' );
-			$sql = "SELECT COUNT(*) AS n FROM $watchlist
-				WHERE wl_title='" . $dbr->strencode($wgTitle->getDBkey()) .
-				"' AND  wl_namespace=" . $wgTitle->getNamespace() ;
-			$res = $dbr->query( $sql, 'Skin::pageStats');
+			$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)
+				array( 'parseinline' ), $wgLang->formatNum( $x->n )
 			);
 		}
 
@@ -1321,7 +1481,8 @@ END;
 
 		$out = '';
 		if( $wgRightsPage ) {
-			$link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
+			$title = Title::newFromText( $wgRightsPage );
+			$link = $this->linkKnown( $title, $wgRightsText );
 		} elseif( $wgRightsUrl ) {
 			$link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
 		} elseif( $wgRightsText ) {
@@ -1330,6 +1491,10 @@ END;
 			# Give up now
 			return $out;
 		}
+		// Allow for site and per-namespace customization of copyright notice.
+		if( isset($wgArticle) )
+			wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
+
 		$out .= wfMsgForContent( $msg, $link );
 		return $out;
 	}
@@ -1346,7 +1511,7 @@ END;
 				$out .= '<a href="'.$url.'">';
 			}
 			$text = htmlspecialchars( $wgRightsText );
-			$out .= "<img src=\"$icon\" alt='$text' />";
+			$out .= "<img src=\"$icon\" alt=\"$text\" width=\"88\" height=\"31\" />";
 			if ( $wgRightsUrl ) {
 				$out .= '</a>';
 			}
@@ -1357,13 +1522,13 @@ END;
 	function getPoweredBy() {
 		global $wgStylePath;
 		$url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
-		$img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="Powered by MediaWiki" /></a>';
+		$img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" height="31" width="88" alt="Powered by MediaWiki" /></a>';
 		return $img;
 	}
 
 	function lastModified() {
 		global $wgLang, $wgArticle;
-		if( $this->mRevisionId ) {
+		if( $this->mRevisionId && $this->mRevisionId != $wgArticle->getLatest()) {
 			$timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
 		} else {
 			$timestamp = $wgArticle->getTimestamp();
@@ -1382,12 +1547,15 @@ END;
 	}
 
 	function logoText( $align = '' ) {
-		if ( '' != $align ) { $a = " align='{$align}'"; }
-		else { $a = ''; }
+		if ( '' != $align ) {
+			$a = " align='{$align}'";
+		} else {
+			$a = '';
+		}
 
 		$mp = wfMsg( 'mainpage' );
 		$mptitle = Title::newMainPage();
-		$url = ( is_object($mptitle) ? $mptitle->escapeLocalURL() : '' );
+		$url = ( is_object( $mptitle ) ? $mptitle->escapeLocalURL() : '' );
 
 		$logourl = $this->getLogo();
 		$s = "<a href='{$url}'><img{$a} src='{$logourl}' alt='[{$mp}]' /></a>";
@@ -1425,13 +1593,13 @@ END;
 	}
 
 	function mainPageLink() {
-		$s = $this->makeKnownLinkObj( Title::newMainPage(), wfMsg( 'mainpage' ) );
-		return $s;
-	}
-
-	function copyrightLink() {
-		$s = $this->makeKnownLink( wfMsgForContent( 'copyrightpage' ),
-		  wfMsg( 'copyrightpagename' ) );
+		$s = $this->link(
+			Title::newMainPage(),
+			wfMsg( 'mainpage' ),
+			array(),
+			array(),
+			array( 'known', 'noclasses' )
+		);
 		return $s;
 	}
 
@@ -1444,8 +1612,11 @@ END;
 			// Otherwise, we display the link for the user, described in their
 			// language (which may or may not be the same as the default language),
 			// but we make the link target be the one site-wide page.
-			return $this->makeKnownLink( wfMsgForContent( $page ),
-				wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) );
+			$title = Title::newFromText( wfMsgForContent( $page ) );
+			return $this->linkKnown(
+				$title,
+				wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) )
+			);
 		}
 	}
 
@@ -1462,20 +1633,26 @@ END;
 	}
 
 	function editThisPage() {
-		global $wgOut, $wgTitle;
+		global $wgOut;
 
 		if ( !$wgOut->isArticleRelated() ) {
 			$s = wfMsg( 'protectedpage' );
 		} else {
-			if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() ) {
+			if( $this->mTitle->quickUserCan( 'edit' ) && $this->mTitle->exists() ) {
 				$t = wfMsg( 'editthispage' );
-			} elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() ) {
+			} elseif( $this->mTitle->quickUserCan( 'create' ) && !$this->mTitle->exists() ) {
 				$t = wfMsg( 'create-this-page' );
 			} else {
 				$t = wfMsg( 'viewsource' );
 			}
 
-			$s = $this->makeKnownLinkObj( $wgTitle, $t, $this->editUrlOptions() );
+			$s = $this->link(
+				$this->mTitle,
+				$t,
+				array(),
+				$this->editUrlOptions(),
+				array( 'known', 'noclasses' )
+			);
 		}
 		return $s;
 	}
@@ -1484,27 +1661,35 @@ END;
 	 * Return URL options for the 'edit page' link.
 	 * This may include an 'oldid' specifier, if the current page view is such.
 	 *
-	 * @return string
+	 * @return array
 	 * @private
 	 */
 	function editUrlOptions() {
 		global $wgArticle;
 
+		$options = array( 'action' => 'edit' );
+
 		if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
-			return "action=edit&oldid=" . intval( $this->mRevisionId );
-		} else {
-			return "action=edit";
+			$options['oldid'] = intval( $this->mRevisionId );
 		}
+
+		return $options;
 	}
 
 	function deleteThisPage() {
-		global $wgUser, $wgTitle, $wgRequest;
+		global $wgUser, $wgRequest;
 
 		$diff = $wgRequest->getVal( 'diff' );
-		if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
+		if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
 			$t = wfMsg( 'deletethispage' );
 
-			$s = $this->makeKnownLinkObj( $wgTitle, $t, 'action=delete' );
+			$s = $this->link(
+				$this->mTitle,
+				$t,
+				array(),
+				array( 'action' => 'delete' ),
+				array( 'known', 'noclasses' )
+			);
 		} else {
 			$s = '';
 		}
@@ -1512,18 +1697,25 @@ END;
 	}
 
 	function protectThisPage() {
-		global $wgUser, $wgTitle, $wgRequest;
+		global $wgUser, $wgRequest;
 
 		$diff = $wgRequest->getVal( 'diff' );
-		if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
-			if ( $wgTitle->isProtected() ) {
-				$t = wfMsg( 'unprotectthispage' );
-				$q = 'action=unprotect';
+		if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
+			if ( $this->mTitle->isProtected() ) {
+				$text = wfMsg( 'unprotectthispage' );
+				$query = array( 'action' => 'unprotect' );
 			} else {
-				$t = wfMsg( 'protectthispage' );
-				$q = 'action=protect';
+				$text = wfMsg( 'protectthispage' );
+				$query = array( 'action' => 'protect' );
 			}
-			$s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
+
+			$s = $this->link(
+				$this->mTitle,
+				$text,
+				array(),
+				$query,
+				array( 'known', 'noclasses' )
+			);
 		} else {
 			$s = '';
 		}
@@ -1531,20 +1723,27 @@ END;
 	}
 
 	function watchThisPage() {
-		global $wgOut, $wgTitle;
+		global $wgOut;
 		++$this->mWatchLinkNum;
 
 		if ( $wgOut->isArticleRelated() ) {
-			if ( $wgTitle->userIsWatching() ) {
-				$t = wfMsg( 'unwatchthispage' );
-				$q = 'action=unwatch';
-				$id = "mw-unwatch-link".$this->mWatchLinkNum;
+			if ( $this->mTitle->userIsWatching() ) {
+				$text = wfMsg( 'unwatchthispage' );
+				$query = array( 'action' => 'unwatch' );
+				$id = 'mw-unwatch-link' . $this->mWatchLinkNum;
 			} else {
-				$t = wfMsg( 'watchthispage' );
-				$q = 'action=watch';
-				$id = 'mw-watch-link'.$this->mWatchLinkNum;
+				$text = wfMsg( 'watchthispage' );
+				$query = array( 'action' => 'watch' );
+				$id = 'mw-watch-link' . $this->mWatchLinkNum;
 			}
-			$s = $this->makeKnownLinkObj( $wgTitle, $t, $q, '', '', " id=\"$id\"" );
+
+			$s = $this->link(
+				$this->mTitle,
+				$text,
+				array( 'id' => $id ),
+				$query,
+				array( 'known', 'noclasses' )
+			);
 		} else {
 			$s = wfMsg( 'notanarticle' );
 		}
@@ -1552,11 +1751,14 @@ END;
 	}
 
 	function moveThisPage() {
-		global $wgTitle;
-
-		if ( $wgTitle->quickUserCan( 'move' ) ) {
-			return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
-			  wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
+		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 '';
@@ -1564,26 +1766,32 @@ END;
 	}
 
 	function historyLink() {
-		global $wgTitle;
-
-		return $this->makeKnownLinkObj( $wgTitle,
-		  wfMsg( 'history' ), 'action=history' );
+		return $this->link(
+			$this->mTitle,
+			wfMsgHtml( 'history' ),
+			array( 'rel' => 'archives' ),
+			array( 'action' => 'history' )
+		);
 	}
 
 	function whatLinksHere() {
-		global $wgTitle;
-
-		return $this->makeKnownLinkObj(
-			SpecialPage::getTitleFor( 'Whatlinkshere', $wgTitle->getPrefixedDBkey() ),
-			wfMsg( 'whatlinkshere' ) );
+		return $this->link(
+			SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
+			wfMsgHtml( 'whatlinkshere' ),
+			array(),
+			array(),
+			array( 'known', 'noclasses' )
+		);
 	}
 
 	function userContribsLink() {
-		global $wgTitle;
-
-		return $this->makeKnownLinkObj(
-			SpecialPage::getTitleFor( 'Contributions', $wgTitle->getDBkey() ),
-			wfMsg( 'contributions' ) );
+		return $this->link(
+			SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
+			wfMsgHtml( 'contributions' ),
+			array(),
+			array(),
+			array( 'known', 'noclasses' )
+		);
 	}
 
 	function showEmailUser( $id ) {
@@ -1594,30 +1802,33 @@ END;
 	}
 
 	function emailUserLink() {
-		global $wgTitle;
-
-		return $this->makeKnownLinkObj(
-			SpecialPage::getTitleFor( 'Emailuser', $wgTitle->getDBkey() ),
-			wfMsg( 'emailuser' ) );
+		return $this->link(
+			SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
+			wfMsg( 'emailuser' ),
+			array(),
+			array(),
+			array( 'known', 'noclasses' )
+		);
 	}
 
 	function watchPageLinksLink() {
-		global $wgOut, $wgTitle;
-
+		global $wgOut;
 		if ( ! $wgOut->isArticleRelated() ) {
 			return '(' . wfMsg( 'notanarticle' ) . ')';
 		} else {
-			return $this->makeKnownLinkObj(
-				SpecialPage::getTitleFor( 'Recentchangeslinked', $wgTitle->getPrefixedDBkey() ),
-				wfMsg( 'recentchangeslinked' ) );
+			return $this->link(
+				SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
+				wfMsg( 'recentchangeslinked-toolbox' ),
+				array(),
+				array(),
+				array( 'known', 'noclasses' )
+			);
 		}
 	}
 
 	function trackbackLink() {
-		global $wgTitle;
-
-		return "<a href=\"" . $wgTitle->trackbackURL() . "\">"
-			. wfMsg('trackbacklink') . "</a>";
+		return '<a href="' . $this->mTitle->trackbackURL() . '">'
+			. wfMsg( 'trackbacklink' ) . '</a>';
 	}
 
 	function otherLanguages() {
@@ -1632,11 +1843,13 @@ END;
 			return '';
 		}
 
-		$s = wfMsg( 'otherlanguages' ) . ': ';
+		$s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' );
 		$first = true;
-		if($wgContLang->isRTL()) $s .= '<span dir="LTR">';
+		if( $wgContLang->isRTL() ) $s .= '<span dir="LTR">';
 		foreach( $a as $l ) {
-			if ( ! $first ) { $s .= ' | '; }
+			if ( !$first ) {
+				$s .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
+			}
 			$first = false;
 
 			$nt = Title::newFromText( $l );
@@ -1644,25 +1857,23 @@ END;
 			$text = $wgContLang->getLanguageName( $nt->getInterwiki() );
 
 			if ( '' == $text ) { $text = $l; }
-			$style = $this->getExternalLinkAttributes( $l, $text );
+			$style = $this->getExternalLinkAttributes();
 			$s .= "<a href=\"{$url}\"{$style}>{$text}</a>";
 		}
-		if($wgContLang->isRTL()) $s .= '</span>';
+		if( $wgContLang->isRTL() ) $s .= '</span>';
 		return $s;
 	}
 
 	function talkLink() {
-		global $wgTitle;
-
-		if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
+		if ( NS_SPECIAL == $this->mTitle->getNamespace() ) {
 			# No discussion links for special pages
 			return '';
 		}
 
 		$linkOptions = array();
 
-		if( $wgTitle->isTalkPage() ) {
-			$link = $wgTitle->getSubjectPage();
+		if( $this->mTitle->isTalkPage() ) {
+			$link = $this->mTitle->getSubjectPage();
 			switch( $link->getNamespace() ) {
 				case NS_MAIN:
 					$text = wfMsg( 'articlepage' );
@@ -1695,7 +1906,7 @@ END;
 					$text = wfMsg( 'articlepage' );
 			}
 		} else {
-			$link = $wgTitle->getTalkPage();
+			$link = $this->mTitle->getTalkPage();
 			$text = wfMsg( 'talkpage' );
 		}
 
@@ -1705,24 +1916,33 @@ END;
 	}
 
 	function commentLink() {
-		global $wgTitle, $wgOut;
+		global $wgOut;
 
-		if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+		if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
 			return '';
 		}
 
 		# __NEWSECTIONLINK___ changes behaviour here
-		# If it's present, the link points to this page, otherwise
+		# If it is present, the link points to this page, otherwise
 		# it points to the talk page
-		if( $wgTitle->isTalkPage() ) {
-			$title = $wgTitle;
+		if( $this->mTitle->isTalkPage() ) {
+			$title = $this->mTitle;
 		} elseif( $wgOut->showNewSectionLink() ) {
-			$title = $wgTitle;
+			$title = $this->mTitle;
 		} else {
-			$title = $wgTitle->getTalkPage();
-		}
-
-		return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit&section=new' );
+			$title = $this->mTitle->getTalkPage();
+		}
+
+		return $this->link(
+			$title,
+			wfMsg( 'postcomment' ),
+			array(),
+			array(
+				'action' => 'edit',
+				'section' => 'new'
+			),
+			array( 'known', 'noclasses' )
+		);
 	}
 
 	/* these are used extensively in SkinTemplate, but also some other places */
@@ -1826,24 +2046,23 @@ END;
 		$bar = array();
 		$lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
 		$heading = '';
-		foreach ($lines as $line) {
-			if (strpos($line, '*') !== 0)
+		foreach( $lines as $line ) {
+			if( strpos( $line, '*' ) !== 0 )
 				continue;
-			if (strpos($line, '**') !== 0) {
-				$line = trim($line, '* ');
-				$heading = $line;
-				if( !array_key_exists($heading, $bar) ) $bar[$heading] = array();
+			if( strpos( $line, '**') !== 0 ) {
+				$heading = trim( $line, '* ' );
+				if( !array_key_exists( $heading, $bar ) ) $bar[$heading] = array();
 			} else {
-				if (strpos($line, '|') !== false) { // sanity check
-					$line = array_map('trim', explode( '|' , trim($line, '* '), 2 ) );
+				if( strpos( $line, '|' ) !== false ) { // sanity check
+					$line = array_map( 'trim', explode( '|', trim( $line, '* ' ), 2 ) );
 					$link = wfMsgForContent( $line[0] );
-					if ($link == '-')
+					if( $link == '-' )
 						continue;
 
-					$text = wfMsgExt($line[1], 'parsemag');
-					if (wfEmptyMsg($line[1], $text))
+					$text = wfMsgExt( $line[1], 'parsemag' );
+					if( wfEmptyMsg( $line[1], $text ) )
 						$text = $line[1];
-					if (wfEmptyMsg($line[0], $link))
+					if( wfEmptyMsg( $line[0], $link ) )
 						$link = $line[0];
 
 					if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
@@ -1861,15 +2080,27 @@ END;
 					$bar[$heading][] = array(
 						'text' => $text,
 						'href' => $href,
-						'id' => 'n-' . strtr($line[1], ' ', '-'),
+						'id' => 'n-' . strtr( $line[1], ' ', '-' ),
 						'active' => false
 					);
 				} else { continue; }
 			}
 		}
-		wfRunHooks('SkinBuildSidebar', array($this, &$bar));
+		wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) );
 		if ( $wgEnableSidebarCache ) $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
 		wfProfileOut( __METHOD__ );
 		return $bar;
 	}
+
+	/**
+	 * Should we include common/wikiprintable.css?  Skins that have their own
+	 * print stylesheet should override this and return false.  (This is an
+	 * ugly hack to get Monobook to play nicely with
+	 * OutputPage::headElement().)
+	 *
+	 * @return bool
+	 */
+	public function commonPrintStylesheet() {
+		return true;
+	}
 }