X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkin.php;h=f000fbfffe82dd7dc28bbc8de6232f360e1cbc2c;hb=4074968ddfebc6dee917b95114a428673b6e7bac;hp=4c5cca292a048b4bc3454539fb5bedc605137936;hpb=b6e0df246f8dda61643d9aba36d9f9e802c909ec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Skin.php b/includes/Skin.php
index 4c5cca292a..f000fbfffe 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -3,8 +3,9 @@
  * @defgroup Skins Skins
  */
 
-if ( ! defined( 'MEDIAWIKI' ) )
+if ( !defined( 'MEDIAWIKI' ) ) {
 	die( 1 );
+}
 
 /**
  * The main skin class that provide methods and properties for all other skins.
@@ -28,12 +29,13 @@ class Skin extends Linker {
 	var $mTitle = null;
 
 	/** Constructor, call parent constructor */
-	function Skin() { parent::__construct(); }
+	function __construct() {
+		parent::__construct();
+	}
 
 	/**
 	 * Fetch the set of available skins.
 	 * @return array of strings
-	 * @static
 	 */
 	static function getSkinNames() {
 		global $wgValidSkinNames;
@@ -53,7 +55,7 @@ class Skin extends Linker {
 				$matches = array();
 				if( preg_match( '/^([^.]*)\.php$/', $file, $matches ) ) {
 					$aSkin = $matches[1];
-					$wgValidSkinNames[strtolower($aSkin)] = $aSkin;
+					$wgValidSkinNames[strtolower( $aSkin )] = $aSkin;
 				}
 			}
 			$skinDir->close();
@@ -82,9 +84,8 @@ class Skin extends Linker {
 	 * Normalize a skin preference value to a form that can be loaded.
 	 * If a skin can't be found, it will fall back to the configured
 	 * default (or the old 'Classic' skin if that's broken).
-	 * @param string $key
+	 * @param $key String: 'monobook', 'standard', etc.
 	 * @return string
-	 * @static
 	 */
 	static function normalizeKey( $key ) {
 		global $wgDefaultSkin;
@@ -105,24 +106,26 @@ class Skin extends Linker {
 		$fallback = array(
 			0 => $wgDefaultSkin,
 			1 => 'nostalgia',
-			2 => 'cologneblue' );
+			2 => 'cologneblue'
+		);
 
-		if( isset( $fallback[$key] ) ){
+		if( isset( $fallback[$key] ) ) {
 			$key = $fallback[$key];
 		}
 
 		if( isset( $skinNames[$key] ) ) {
 			return $key;
+		} else if( isset( $skinNames[$wgDefaultSkin] ) ) {
+			return $wgDefaultSkin;
 		} else {
-			return 'monobook';
+			return 'vector';
 		}
 	}
 
 	/**
 	 * Factory method for loading a skin of a given type
-	 * @param string $key 'monobook', 'standard', etc
+	 * @param $key String: 'monobook', 'standard', etc.
 	 * @return Skin
-	 * @static
 	 */
 	static function &newFromKey( $key ) {
 		global $wgStyleDirectory;
@@ -131,13 +134,15 @@ class Skin extends Linker {
 
 		$skinNames = Skin::getSkinNames();
 		$skinName = $skinNames[$key];
-		$className = 'Skin'.ucfirst($key);
+		$className = 'Skin' . ucfirst( $key );
 
 		# 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( file_exists( $deps ) ) include_once( $deps );
+			if( file_exists( $deps ) ) {
+				include_once( $deps );
+			}
 			require_once( "{$wgStyleDirectory}/{$skinName}.php" );
 
 			# Check if we got if not failback to default skin
@@ -147,8 +152,8 @@ class Skin extends Linker {
 				# except by SQL manipulation if a previously valid skin name
 				# is no longer valid.
 				wfDebug( "Skin class does not exist: $className\n" );
-				$className = 'SkinMonobook';
-				require_once( "{$wgStyleDirectory}/MonoBook.php" );
+				$className = 'SkinVector';
+				require_once( "{$wgStyleDirectory}/Vector.php" );
 			}
 		}
 		$skin = new $className;
@@ -168,7 +173,9 @@ class Skin extends Linker {
 	function qbSetting() {
 		global $wgOut, $wgUser;
 
-		if ( $wgOut->isQuickbarSuppressed() ) { return 0; }
+		if ( $wgOut->isQuickbarSuppressed() ) {
+			return 0;
+		}
 		$q = $wgUser->getOption( 'quickbar', 0 );
 		return $q;
 	}
@@ -180,7 +187,7 @@ class Skin extends Linker {
 
 		# 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
+		# 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 ) );
@@ -229,6 +236,11 @@ class Skin extends Linker {
 		$lb->execute();
 	}
 
+	/**
+	 * Adds metadata links (Creative Commons/Dublin Core/copyright) to the HTML
+	 * output.
+	 * @param $out Object: instance of OutputPage
+	 */
 	function addMetadataLinks( OutputPage $out ) {
 		global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
 		global $wgRightsPage, $wgRightsUrl;
@@ -271,7 +283,7 @@ class Skin extends Linker {
 	/**
 	 * Set some local variables
 	 */
-	protected function setMembers(){
+	protected function setMembers() {
 		global $wgUser;
 		$this->mUser = $wgUser;
 		$this->userpage = $wgUser->getUserPage()->getPrefixedText();
@@ -280,7 +292,7 @@ class Skin extends Linker {
 
 	/**
 	 * Set the title
-	 * @param Title $t The title to use
+	 * @param $t Title object to use
 	 */
 	public function setTitle( $t ) {
 		$this->mTitle = $t;
@@ -291,6 +303,10 @@ class Skin extends Linker {
 		return $this->mTitle;
 	}
 
+	/**
+	 * Outputs the HTML generated by other functions.
+	 * @param $out Object: instance of OutputPage
+	 */
 	function outputPage( OutputPage $out ) {
 		global $wgDebugComments;
 		wfProfileIn( __METHOD__ );
@@ -303,12 +319,6 @@ class Skin extends Linker {
 
 		$out->out( $out->headElement( $this ) );
 
-		$out->out( "\n<body" );
-		$ops = $this->getBodyOptions();
-		foreach ( $ops as $name => $val ) {
-			$out->out( " $name='$val'" );
-		}
-		$out->out( ">\n" );
 		if ( $wgDebugComments ) {
 			$out->out( "<!-- Wiki debugging output:\n" .
 			  $out->mDebugtext . "-->\n" );
@@ -348,7 +358,7 @@ class Skin extends Linker {
 	 * Make a <script> tag containing global variables
 	 * @param $skinName string Name of the skin
 	 * The odd calling convention is for backwards compatibility
-	 * @TODO @FIXME Make this not depend on $wgTitle!
+	 * @todo FIXME: Make this not depend on $wgTitle!
 	 */
 	static function makeGlobalVariablesScript( $skinName ) {
 		if ( is_array( $skinName ) ) {
@@ -362,7 +372,7 @@ class Skin extends Linker {
 		global $wgUseAjax, $wgAjaxWatch;
 		global $wgVersion, $wgEnableAPI, $wgEnableWriteAPI;
 		global $wgRestrictionTypes;
-		global $wgMWSuggestTemplate, $wgDBname, $wgEnableMWSuggest;
+		global $wgDBname, $wgEnableMWSuggest;
 		global $wgSitename;
 
 		$ns = $wgTitle->getNamespace();
@@ -380,11 +390,11 @@ class Skin extends Linker {
 			implode( "\t", $digitTransTable ),
 		);
 
-		$mainPage = Title::newFromText( wfMsgForContent( 'mainpage' ) );
+		$mainPage = Title::newMainPage();
 		$vars = array(
 			'skin' => $skinName,
 			'stylepath' => $wgStylePath,
-			'urlprotocols' => wfUrlProtocols(),
+			'wgUrlProtocols' => wfUrlProtocols(),
 			'wgArticlePath' => $wgArticlePath,
 			'wgScriptPath' => $wgScriptPath,
 			'wgScriptExtension' => $wgScriptExtension,
@@ -402,7 +412,7 @@ class Skin extends Linker {
 			'wgArticleId' => $wgTitle->getArticleId(),
 			'wgIsArticle' => $wgOut->isArticle(),
 			'wgUserName' => $wgUser->isAnon() ? null : $wgUser->getName(),
-			'wgUserGroups' => $wgUser->isAnon() ? null : $wgUser->getEffectiveGroups(),
+			'wgUserGroups' => $wgUser->getEffectiveGroups(),
 			'wgUserLanguage' => $wgLang->getCode(),
 			'wgContentLanguage' => $wgContLang->getCode(),
 			'wgBreakFrames' => $wgBreakFrames,
@@ -422,25 +432,26 @@ class Skin extends Linker {
 			$vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
 		}
 
-		//if on upload page output the extension list & js_upload
-		if( SpecialPage::resolveAlias( $wgTitle->getDBkey() ) ==  "Upload" ) {
-			global $wgFileExtensions, $wgAjaxUploadInterface;
+		// if on upload page output the extension list & js_upload
+		if( SpecialPage::resolveAlias( $wgTitle->getDBkey() ) == 'Upload' ) {
+			global $wgFileExtensions;
 			$vars['wgFileExtensions'] = $wgFileExtensions;
 		}
 
-		if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){
+		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' ) );
 		}
 
-		foreach( $wgRestrictionTypes as $type )
+		foreach( $wgRestrictionTypes as $type ) {
 			$vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type );
+		}
 
 		if ( $wgOut->isArticleRelated() && $wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
 			$msgs = (object)array();
-			foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching', 
+			foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching',
 				'tooltip-ca-watch', 'tooltip-ca-unwatch' ) as $msgName ) {
 				$msgs->{$msgName . 'Msg'} = wfMsg( $msgName );
 			}
@@ -460,26 +471,30 @@ class Skin extends Linker {
 	 * passed back with the preview request, we won't render
 	 * the code.
 	 *
-	 * @param string $action
+	 * @param $action String: 'edit', 'submit' etc.
 	 * @return bool
 	 */
 	public function userCanPreview( $action ) {
 		global $wgRequest, $wgUser;
 
-		if( $action != 'submit' )
+		if( $action != 'submit' ) {
 			return false;
-		if( !$wgRequest->wasPosted() )
+		}
+		if( !$wgRequest->wasPosted() ) {
 			return false;
-		if( !$this->mTitle->userCanEditCssSubpage() )
+		}
+		if( !$this->mTitle->userCanEditCssSubpage() ) {
 			return false;
-		if( !$this->mTitle->userCanEditJsSubpage() )
+		}
+		if( !$this->mTitle->userCanEditJsSubpage() ) {
 			return false;
+		}
 		return $wgUser->matchEditToken(
 			$wgRequest->getVal( 'wpEditToken' ) );
 	}
 
 	/**
-	 * generated JavaScript action=raw&gen=js
+	 * 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?
@@ -489,8 +504,7 @@ 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
-	 *
+	 * @param $skinName String: If set, overrides the skin name
 	 * @return string
 	 */
 	public function generateUserJs( $skinName = null ) {
@@ -498,23 +512,23 @@ class Skin extends Linker {
 
 		wfProfileIn( __METHOD__ );
 		if( !$skinName ) {
-			$skinName =	$this->getSkinName();
+			$skinName = $this->getSkinName();
 		}
 
 		$s = "/* generated javascript */\n";
-		$s .= "var skin = '" . Xml::escapeJsString($skinName ) . "';\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' );
+		$commonJs = wfMsgExt( 'common.js', 'content' );
 		if ( !wfEmptyMsg( 'common.js', $commonJs ) ) {
 			$s .= $commonJs;
 		}
 
-		$s .= "\n\n/* MediaWiki:".ucfirst( $skinName ).".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( $skinName ) . '.js';
-		$userJS = wfMsgForContent( $msgKey );
+		$userJS = wfMsgExt( $msgKey, 'content' );
 		if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
 			$s .= $userJS;
 		}
@@ -536,8 +550,9 @@ class Skin extends Linker {
 
 	/**
 	 * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
+	 * Anything in here won't be generated if $wgAllowUserCssPrefs is false.
 	 */
-	protected function reallyGenerateUserStylesheet(){
+	protected function reallyGenerateUserStylesheet() {
 		global $wgUser;
 		$s = '';
 		if( ( $undopt = $wgUser->getOption( 'underline' ) ) < 2 ) {
@@ -582,8 +597,8 @@ CSS;
 	 * @private
 	 */
 	function setupUserCss( OutputPage $out ) {
-		global $wgRequest, $wgContLang, $wgUser;
-		global $wgAllowUserCss, $wgUseSiteCss, $wgSquidMaxage, $wgStylePath;
+		global $wgRequest, $wgUser;
+		global $wgAllowUserCss, $wgUseSiteCss, $wgSquidMaxage;
 
 		wfProfileIn( __METHOD__ );
 
@@ -603,11 +618,7 @@ CSS;
 		// Per-site custom styles
 		if( $wgUseSiteCss ) {
 			global $wgHandheldStyle;
-			$query = wfArrayToCGI( array(
-				'usemsgcache' => 'yes',
-				'ctype' => 'text/css',
-				'smaxage' => $wgSquidMaxage
-			) + $siteargs );
+			$query = wfArrayToCGI( self::getDynamicStylesheetQuery() );
 			# Site settings must override extension css! (bug 15025)
 			$out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) );
 			$out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ), 'print' );
@@ -617,18 +628,21 @@ CSS;
 			$out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
 		}
 
-		if( $wgUser->isLoggedIn() ) {
-			// Ensure that logged-in users' generated CSS isn't clobbered
-			// by anons' publicly cacheable generated CSS.
-			$siteargs['smaxage'] = '0';
-			$siteargs['ts'] = $wgUser->mTouched;
-		}
-		// Per-user styles based on preferences
-		$siteargs['gen'] = 'css';
-		if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) {
-			$siteargs['useskin'] = $us;
+		global $wgAllowUserCssPrefs;
+		if( $wgAllowUserCssPrefs ){
+			if( $wgUser->isLoggedIn() ) {
+				// Ensure that logged-in users' generated CSS isn't clobbered
+				// by anons' publicly cacheable generated CSS.
+				$siteargs['smaxage'] = '0';
+				$siteargs['ts'] = $wgUser->mTouched;
+			}
+			// Per-user styles based on preferences
+			$siteargs['gen'] = 'css';
+			if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) {
+				$siteargs['useskin'] = $us;
+			}
+			$out->addStyle( self::makeUrl( '-', wfArrayToCGI( $siteargs ) ) );
 		}
-		$out->addStyle( self::makeUrl( '-', wfArrayToCGI( $siteargs ) ) );
 
 		// Per-user custom style pages
 		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) {
@@ -638,13 +652,34 @@ CSS;
 				// @FIXME: properly escape the cdata!
 				$out->addInlineStyle( $wgRequest->getText( 'wpTextbox1' ) );
 			} else {
-				$out->addStyle( self::makeUrl( $this->userpage . '/' . $this->getSkinName() .'.css',
-					'action=raw&ctype=text/css' ) );
+				$names = array( 'common', $this->getSkinName() );
+				foreach( $names as $name ) {
+					$out->addStyle( self::makeUrl(
+						$this->userpage . '/' . $name . '.css',
+						'action=raw&ctype=text/css' )
+					);
+				}
 			}
 		}
 
 		wfProfileOut( __METHOD__ );
 	}
+	
+	/**
+	 * Get the query to generate a dynamic stylesheet
+	 * 
+	 * @return array
+	 */
+	public static function getDynamicStylesheetQuery() {
+		global $wgSquidMaxage;
+		return array(
+				'action' => 'raw',
+				'maxage' => $wgSquidMaxage,
+				'usemsgcache' => 'yes',
+				'ctype' => 'text/css',
+				'smaxage' => $wgSquidMaxage,
+			);
+	}
 
 	/**
 	 * Add skin specific stylesheets
@@ -657,32 +692,8 @@ CSS;
 		$out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
 	}
 
-	function getBodyOptions() {
-		global $wgUser, $wgOut, $wgRequest, $wgContLang;
-
-		extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
-
-		if ( 0 != $this->mTitle->getNamespace() ) {
-			$a = array( 'bgcolor' => '#ffffec' );
-		}
-		else $a = array( 'bgcolor' => '#FFFFFF' );
-		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['onload'] = $wgOut->getOnloadHandler();
-		$a['class'] =
-			'mediawiki' .
-			' '.( $wgContLang->getDir() ).
-			' '.$this->getPageClasses( $this->mTitle ) .
-			' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
-		return $a;
-	}
-
 	function getPageClasses( $title ) {
-		$numeric = 'ns-'.$title->getNamespace();
+		$numeric = 'ns-' . $title->getNamespace();
 		if( $title->getNamespace() == NS_SPECIAL ) {
 			$type = 'ns-special';
 		} elseif( $title->isTalkPage() ) {
@@ -690,7 +701,7 @@ CSS;
 		} else {
 			$type = 'ns-subject';
 		}
-		$name = Sanitizer::escapeClass( 'page-'.$title->getPrefixedText() );
+		$name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() );
 		return "$numeric $type $name";
 	}
 
@@ -717,7 +728,8 @@ CSS;
 		$s = '';
 		$qb = $this->qbSetting();
 
-		if( $langlinks = $this->otherLanguages() ) {
+		$langlinks = $this->otherLanguages();
+		if( $langlinks ) {
 			$rows = 2;
 			$borderhack = '';
 		} else {
@@ -731,11 +743,13 @@ CSS;
 
 		$shove = ( $qb != 0 );
 		$left = ( $qb == 1 || $qb == 3 );
-		if( $wgContLang->isRTL() ) $left = !$left;
+		if( $wgContLang->isRTL() ) {
+			$left = !$left;
+		}
 
 		if( !$shove ) {
 			$s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
-			  $this->logoText() . '</td>';
+				$this->logoText() . '</td>';
 		} elseif( $left ) {
 			$s .= $this->getQuickbarCompensator( $rows );
 		}
@@ -743,12 +757,12 @@ CSS;
 		$s .= "<td {$borderhack} align='$l' valign='top'>\n";
 
 		$s .= $this->topLinks();
-		$s .= "<p class='subtitle'>" . $this->pageTitleLinks() . "</p>\n";
+		$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>";
+		$s .= "\n<br />" . $this->searchForm() . '</td>';
 
 		if ( $langlinks ) {
 			$s .= "</tr>\n<tr>\n<td class='top' colspan=\"2\">$langlinks</td>\n";
@@ -771,12 +785,13 @@ CSS;
 		return $s;
 	}
 
-
 	function getCategoryLinks() {
 		global $wgOut, $wgUseCategoryBrowser;
 		global $wgContLang, $wgUser;
 
-		if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
+		if( count( $wgOut->mCategoryLinks ) == 0 ) {
+			return '';
+		}
 
 		# Separator
 		$sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities' ) );
@@ -811,19 +826,19 @@ CSS;
 			$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 .
-				"</div>";
+				'</div>';
 		}
 
 		# optional 'dmoz-like' category browser. Will be shown under the list
 		# of categories an article belong to
-		if( $wgUseCategoryBrowser ){
+		if( $wgUseCategoryBrowser ) {
 			$s .= '<br /><hr />';
 
 			# get a big array of the parents tree
 			$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", $this->drawCategoryBrowser( $parenttree, $this ) );
 			# Clean out bogus first entry and sort them
 			unset( $tempout[0] );
 			asort( $tempout );
@@ -840,7 +855,7 @@ CSS;
 	 * @param &skin Object: skin passed by reference
 	 * @return String separated by &gt;, terminate with "\n"
 	 */
-	function drawCategoryBrowser( $tree, &$skin ){
+	function drawCategoryBrowser( $tree, &$skin ) {
 		$return = '';
 		foreach( $tree as $element => $parent ) {
 			if( empty( $parent ) ) {
@@ -848,7 +863,7 @@ CSS;
 				$return .= "\n";
 			} else {
 				# grab the others elements
-				$return .= Skin::drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
+				$return .= $this->drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
 			}
 			# add our current element to the list
 			$eltitle = Title::newFromText( $element );
@@ -868,7 +883,7 @@ CSS;
 		$showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
 						$this->mTitle->getNamespace() == NS_CATEGORY;
 
-		if( empty($allCats['normal']) && !( !empty($allCats['hidden']) && $showHidden ) ) {
+		if( empty( $allCats['normal'] ) && !( !empty( $allCats['hidden'] ) && $showHidden ) ) {
 			$classes .= ' catlinks-allhidden';
 		}
 
@@ -876,7 +891,7 @@ CSS;
 	}
 
 	function getQuickbarCompensator( $rows = 1 ) {
-		return "<td width='152' rowspan='{$rows}'>&nbsp;</td>";
+		return "<td width='152' rowspan='{$rows}'>&#160;</td>";
 	}
 
 	/**
@@ -896,10 +911,10 @@ CSS;
 	protected function afterContentHook() {
 		$data = '';
 
-		if( wfRunHooks( 'SkinAfterContent', array( &$data ) ) ){
+		if( wfRunHooks( 'SkinAfterContent', array( &$data ) ) ) {
 			// adding just some spaces shouldn't toggle the output
 			// of the whole <div/>, so we use trim() here
-			if( trim( $data ) != '' ){
+			if( trim( $data ) != '' ) {
 				// Doing this here instead of in the skins to
 				// ensure that the div has the same ID in all
 				// skins
@@ -939,8 +954,9 @@ CSS;
 			$ident = strlen( $line ) - strlen( $display );
 			$diff = $ident - $curIdent;
 
-			if ( $display == '' )
+			if ( $display == '' ) {
 				$display = "\xc2\xa0";
+			}
 
 			if ( !$ident && $diff < 0 && substr( $display, 0, 9 ) != 'Entering ' && substr( $display, 0, 8 ) != 'Exiting ' ) {
 				$ident = $curIdent;
@@ -950,12 +966,13 @@ CSS;
 				$display = htmlspecialchars( $display );
 			}
 
-			if ( $diff < 0 )
+			if ( $diff < 0 ) {
 				$ret .= str_repeat( "</li></ul>\n", -$diff ) . "</li><li>\n";
-			elseif ( $diff == 0 )
+			} elseif ( $diff == 0 ) {
 				$ret .= "</li><li>\n";
-			else
+			} else {
 				$ret .= str_repeat( "<ul><li>\n", $diff );
+			}
 			$ret .= $display . "\n";
 
 			$curIdent = $ident;
@@ -986,7 +1003,7 @@ CSS;
 	/** @return string Retrievied from HTML text */
 	function printSource() {
 		$url = htmlspecialchars( $this->mTitle->getFullURL() );
-		return wfMsg( 'retrievedfrom', '<a href="'.$url.'">'.$url.'</a>' );
+		return wfMsg( 'retrievedfrom', '<a href="' . $url . '">' . $url . '</a>' );
 	}
 
 	function printFooter() {
@@ -995,7 +1012,9 @@ CSS;
 	}
 
 	/** overloaded by derived classes */
-	function doAfterContent() { return '</div></div>'; }
+	function doAfterContent() {
+		return '</div></div>';
+	}
 
 	function pageTitleLinks() {
 		global $wgOut, $wgUser, $wgRequest, $wgLang;
@@ -1069,7 +1088,7 @@ CSS;
 	}
 
 	function getUndeleteLink() {
-		global $wgUser, $wgContLang, $wgLang, $wgRequest;
+		global $wgUser, $wgLang, $wgRequest;
 
 		$action = $wgRequest->getVal( 'action', 'view' );
 
@@ -1117,6 +1136,10 @@ CSS;
 		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>';
@@ -1139,8 +1162,9 @@ CSS;
 
 	function subPageSubtitle() {
 		$subpages = '';
-		if( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) )
+		if( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) ) {
 			return $subpages;
+		}
 
 		global $wgOut;
 		if( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
@@ -1155,7 +1179,7 @@ CSS;
 					$growinglink .= $link;
 					$display .= $link;
 					$linkObj = Title::newFromText( $growinglink );
-					if( is_object( $linkObj ) && $linkObj->exists() ){
+					if( is_object( $linkObj ) && $linkObj->exists() ) {
 						$getlink = $this->link(
 							$linkObj,
 							htmlspecialchars( $display ),
@@ -1260,16 +1284,17 @@ CSS;
 		global $wgRequest, $wgUseTwoButtonsSearchForm;
 		$search = $wgRequest->getText( 'search' );
 
-		$s = '<form id="searchform'.$this->searchboxes.'" name="search" class="inline" method="post" action="'
+		$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="'
+		  . '<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 .= '&nbsp;<input type="submit" name="fulltext" value="' . wfMsg( 'searchbutton' ) . "\" />\n";
-		else
+		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>';
 
@@ -1345,11 +1370,12 @@ CSS;
 		if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
 			foreach( $variants as $code ) {
 				$varname = $wgContLang->getVariantname( $code );
-				if( $varname == 'disable' )
+				if( $varname == 'disable' ) {
 					continue;
+				}
 				$s = $wgLang->pipeList( array(
 					$s,
-					'<a href="' . $this->mTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
+					'<a href="' . $this->mTitle->escapeLocalURL( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
 				) );
 			}
 		}
@@ -1371,15 +1397,20 @@ CSS;
 			$element[] = $this->whatLinksHere();
 			$element[] = $this->watchPageLinksLink();
 
-			if( $wgUseTrackbacks )
+			if( $wgUseTrackbacks ) {
 				$element[] = $this->trackbackLink();
+			}
 
-			if ( $this->mTitle->getNamespace() == NS_USER
-			    || $this->mTitle->getNamespace() == NS_USER_TALK ){
+			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
+				# Both anons and non-anons have contributions list
+				if( $id || $ip ) {
 					$element[] = $this->userContribsLink();
 				}
 				if( $this->showEmailUser( $id ) ) {
@@ -1391,9 +1422,16 @@ CSS;
 
 			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(); }
+				// 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();
 		}
@@ -1407,10 +1445,18 @@ CSS;
 
 		$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 ''; }
+		if ( !$wgOut->isArticle() ) {
+			return '';
+		}
+		if( !$wgArticle instanceof Article ) {
+			return '';
+		}
+		if ( isset( $oldid ) || isset( $diff ) ) {
+			return '';
+		}
+		if ( 0 == $wgArticle->getID() ) {
+			return '';
+		}
 
 		$s = '';
 		if ( !$wgDisableCounters ) {
@@ -1420,7 +1466,7 @@ CSS;
 			}
 		}
 
-		if( $wgMaxCredits != 0 ){
+		if( $wgMaxCredits != 0 ) {
 			$s .= ' ' . Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
 		} else {
 			$s .= $this->lastModified();
@@ -1428,9 +1474,13 @@ CSS;
 
 		if( $wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ) ) {
 			$dbr = wfGetDB( DB_SLAVE );
-			$res = $dbr->select( 'watchlist',
+			$res = $dbr->select(
+				'watchlist',
 				array( 'COUNT(*) AS n' ),
-				array( 'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ), 'wl_namespace' => $this->mTitle->getNamespace() ),
+				array(
+					'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ),
+					'wl_namespace' => $this->mTitle->getNamespace()
+				),
 				__METHOD__
 			);
 			$x = $dbr->fetchObject( $res );
@@ -1475,10 +1525,16 @@ CSS;
 			return $out;
 		}
 		// Allow for site and per-namespace customization of copyright notice.
-		if( isset($wgArticle) )
-			wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
+		$forContent = true;
+		if( isset( $wgArticle ) ) {
+			wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link, &$forContent ) );
+		}
 
-		$out .= wfMsgForContent( $msg, $link );
+		if ( $forContent ) {
+			$out .= wfMsgForContent( $msg, $link );
+		} else {
+			$out .= wfMsg( $msg, $link );
+		}
 		return $out;
 	}
 
@@ -1487,7 +1543,7 @@ CSS;
 		$out = '';
 		if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
 			$out = $wgCopyrightIcon;
-		} else if ( $wgRightsIcon ) {
+		} elseif ( $wgRightsIcon ) {
 			$icon = htmlspecialchars( $wgRightsIcon );
 			if ( $wgRightsUrl ) {
 				$url = htmlspecialchars( $wgRightsUrl );
@@ -1502,16 +1558,20 @@ CSS;
 		return $out;
 	}
 
+	/**
+	 * Gets the powered by MediaWiki icon.
+	 * @return string
+	 */
 	function getPoweredBy() {
 		global $wgStylePath;
 		$url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
-		$img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" height="31" width="88" 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 && $this->mRevisionId != $wgArticle->getLatest()) {
+		if( $this->mRevisionId && $this->mRevisionId != $wgArticle->getLatest() ) {
 			$timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
 		} else {
 			$timestamp = $wgArticle->getTimestamp();
@@ -1546,10 +1606,10 @@ CSS;
 	}
 
 	/**
-	 * show a drop-down box of special pages
+	 * Show a drop-down box of special pages
 	 */
 	function specialPagesList() {
-		global $wgUser, $wgContLang, $wgServer, $wgRedirectScript;
+		global $wgContLang, $wgServer, $wgRedirectScript;
 		$pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
 		foreach ( $pages as $name => $page ) {
 			$pages[$name] = $page->getDescription();
@@ -1575,6 +1635,10 @@ CSS;
 		return $s;
 	}
 
+	/**
+	 * Gets the link to the wiki's main page.
+	 * @return string
+	 */
 	function mainPageLink() {
 		$s = $this->link(
 			Title::newMainPage(),
@@ -1586,7 +1650,7 @@ CSS;
 		return $s;
 	}
 
-	private function footerLink ( $desc, $page ) {
+	private function footerLink( $desc, $page ) {
 		// if the link description has been set to "-" in the default language,
 		if ( wfMsgForContent( $desc )  == '-') {
 			// then it is disabled, for all languages.
@@ -1603,14 +1667,23 @@ CSS;
 		}
 	}
 
+	/**
+	 * Gets the link to the wiki's privacy policy page.
+	 */
 	function privacyLink() {
 		return $this->footerLink( 'privacy', 'privacypage' );
 	}
 
+	/**
+	 * Gets the link to the wiki's about page.
+	 */
 	function aboutLink() {
 		return $this->footerLink( 'aboutsite', 'aboutpage' );
 	}
 
+	/**
+	 * Gets the link to the wiki's general disclaimers page.
+	 */
 	function disclaimerLink() {
 		return $this->footerLink( 'disclaimers', 'disclaimerpage' );
 	}
@@ -1780,7 +1853,7 @@ CSS;
 	function showEmailUser( $id ) {
 		global $wgUser;
 		$targetUser = User::newFromId( $id );
-		return	$wgUser->canSendEmail() && # the sending user must have a confirmed email address
+		return $wgUser->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
 	}
 
@@ -1796,7 +1869,7 @@ CSS;
 
 	function watchPageLinksLink() {
 		global $wgOut;
-		if ( ! $wgOut->isArticleRelated() ) {
+		if ( !$wgOut->isArticleRelated() ) {
 			return '(' . wfMsg( 'notanarticle' ) . ')';
 		} else {
 			return $this->link(
@@ -1828,7 +1901,9 @@ CSS;
 
 		$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 .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
@@ -1838,12 +1913,17 @@ CSS;
 			$nt = Title::newFromText( $l );
 			$url = $nt->escapeFullURL();
 			$text = $wgContLang->getLanguageName( $nt->getInterwiki() );
+			$title = htmlspecialchars( $nt->getText() );
 
-			if ( $text == '' ) { $text = $l; }
+			if ( $text == '' ) {
+				$text = $l;
+			}
 			$style = $this->getExternalLinkAttributes();
-			$s .= "<a href=\"{$url}\"{$style}>{$text}</a>";
+			$s .= "<a href=\"{$url}\" title=\"{$title}\"{$style}>{$text}</a>";
+		}
+		if( $wgContLang->isRTL() ) {
+			$s .= '</span>';
 		}
-		if( $wgContLang->isRTL() ) $s .= '</span>';
 		return $s;
 	}
 
@@ -1928,6 +2008,23 @@ CSS;
 		);
 	}
 
+	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' )
+			);
+		}
+	}
+
 	/* these are used extensively in SkinTemplate, but also some other places */
 	static function makeMainPageUrl( $urlaction = '' ) {
 		$title = Title::newMainPage();
@@ -1957,8 +2054,10 @@ CSS;
 		return $title->getLocalURL( $urlaction );
 	}
 
-	# If url string starts with http, consider as external URL, else
-	# internal
+	/**
+	 * If url string starts with http, consider as external URL, else
+	 * internal
+	 */
 	static function makeInternalOrExternalUrl( $name ) {
 		if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $name ) ) {
 			return $name;
@@ -2030,38 +2129,61 @@ CSS;
 		$this->addToSidebar( $bar, 'sidebar' );
 
 		wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) );
-		if ( $wgEnableSidebarCache ) $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
+		if ( $wgEnableSidebarCache ) {
+			$parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
+		}
 		wfProfileOut( __METHOD__ );
 		return $bar;
 	}
 	/**
 	 * Add content from a sidebar system message
 	 * Currently only used for MediaWiki:Sidebar (but may be used by Extensions)
+	 *
+	 * This is just a wrapper around addToSidebarPlain() for backwards compatibility
 	 * 
 	 * @param &$bar array
 	 * @param $message String
 	 */
 	function addToSidebar( &$bar, $message ) {
-		$lines = explode( "\n", wfMsgForContent( $message ) );
+		$this->addToSidebarPlain( $bar, wfMsgForContent( $message ) );
+	}
+	
+	/**
+	 * Add content from plain text
+	 * @since 1.17
+	 * @param &$bar array
+	 * @param $text string
+	 */
+	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 = '';
 		foreach( $lines as $line ) {
-			if( strpos( $line, '*' ) !== 0 )
+			if( strpos( $line, '*' ) !== 0 ) {
 				continue;
+			}
 			if( strpos( $line, '**') !== 0 ) {
 				$heading = trim( $line, '* ' );
-				if( !array_key_exists( $heading, $bar ) ) $bar[$heading] = array();
+				if( !array_key_exists( $heading, $bar ) ) {
+					$bar[$heading] = array();
+				}
 			} else {
+				$line = trim( $line, '* ' );
 				if( strpos( $line, '|' ) !== false ) { // sanity check
-					$line = array_map( 'trim', explode( '|', trim( $line, '* ' ), 2 ) );
+					$line = array_map( 'trim', explode( '|', $line, 2 ) );
 					$link = wfMsgForContent( $line[0] );
-					if( $link == '-' )
+					if( $link == '-' ) {
 						continue;
+					}
 
 					$text = wfMsgExt( $line[1], 'parsemag' );
-					if( wfEmptyMsg( $line[1], $text ) )
+					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 ) ) {
 						$href = $link;
@@ -2081,9 +2203,26 @@ CSS;
 						'id' => 'n-' . strtr( $line[1], ' ', '-' ),
 						'active' => false
 					);
-				} else { continue; }
+				} else if ( (substr($line, 0, 2) == '{{') && (substr($line, -2) == '}}') ) {
+					global $wgParser, $wgTitle;
+					
+					$line = substr($line, 2, strlen($line) - 4 );
+					
+					if (is_null($wgParser->mOptions))
+						$wgParser->mOptions = new ParserOptions();
+					
+					$wgParser->mOptions->setEditSection(false);
+					$wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $wgTitle, $wgParser->mOptions )->getText();
+				} else {
+					continue;
+				}
 			}
 		}
+		
+		if ( count($wikiBar) > 0 )
+			$bar = array_merge($bar, $wikiBar);
+		
+		return $bar;
 	}
 
 	/**
@@ -2097,4 +2236,60 @@ CSS;
 	public function commonPrintStylesheet() {
 		return true;
 	}
+
+	/**
+	 * Gets new talk page messages for the current user.
+	 * @return MediaWiki message or if no new talk page messages, nothing
+	 */
+	function getNewtalks() {
+		global $wgUser, $wgOut;
+		$newtalks = $wgUser->getNewMessageLinks();
+		$ntl = '';
+
+		if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
+			$userTitle = $this->mUser->getUserPage();
+			$userTalkTitle = $userTitle->getTalkPage();
+
+			if( !$userTalkTitle->equals( $this->mTitle ) ) {
+				$newMessagesLink = $this->link(
+					$userTalkTitle,
+					wfMsgHtml( 'newmessageslink' ),
+					array(),
+					array( 'redirect' => 'no' ),
+					array( 'known', 'noclasses' )
+				);
+
+				$newMessagesDiffLink = $this->link(
+					$userTalkTitle,
+					wfMsgHtml( 'newmessagesdifflink' ),
+					array(),
+					array( 'diff' => 'cur' ),
+					array( 'known', 'noclasses' )
+				);
+
+				$ntl = wfMsg(
+					'youhavenewmessages',
+					$newMessagesLink,
+					$newMessagesDiffLink
+				);
+				# Disable Squid cache
+				$wgOut->setSquidMaxage( 0 );
+			}
+		} elseif( count( $newtalks ) ) {
+			// _>" " for BC <= 1.16
+			$sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
+			$msgs = array();
+			foreach( $newtalks as $newtalk ) {
+				$msgs[] = Xml::element(
+					'a',
+					array( 'href' => $newtalk['link'] ), $newtalk['wiki']
+				);
+			}
+			$parts = implode( $sep, $msgs );
+			$ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
+			$wgOut->setSquidMaxage( 0 );
+		}
+		return $ntl;
+	}
+
 }