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

diff --git a/includes/Skin.php b/includes/Skin.php
index 6ff984b177..17da161abe 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -62,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
@@ -277,7 +277,7 @@ class Skin extends Linker {
 		$this->userpage = $wgUser->getUserPage()->getPrefixedText();
 		$this->usercss = false;
 	}
-	
+
 	/**
 	 * Set the title
 	 * @param Title $t The title to use
@@ -285,7 +285,7 @@ class Skin extends Linker {
 	public function setTitle( $t ) {
 		$this->mTitle = $t;
 	}
-	
+
 	/** Get the title */
 	public function getTitle() {
 		return $this->mTitle;
@@ -319,7 +319,7 @@ class Skin extends Linker {
 		$out->out( $out->mBodytext . "\n" );
 
 		$out->out( $this->afterContent() );
-		
+
 		$out->out( $afterContent );
 
 		$out->out( $this->bottomScripts() );
@@ -331,44 +331,42 @@ class Skin extends Linker {
 	}
 
 	static function makeVariablesScript( $data ) {
-		global $wgJsMimeType;
-
-		$doneFirstVar = false;
-		$r = array( "<script type=\"$wgJsMimeType\">/*<![CDATA[*/\n" );
-		foreach ( $data as $name => $value ) {
-			$encValue = Xml::encodeJsVar( $value );
- 			if ( $doneFirstVar )
- 				$r[] = ",\n$name=$encValue";
- 			else {
- 				$r[] = "var $name=$encValue";
- 				$doneFirstVar = true;
- 			}
+		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 '';
 		}
-		# No need for ; since the script is terminating
- 		$r[] = "\n/*]]>*/</script>\n";
-
-		return implode( $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, $wgTitle, $wgStylePath, $wgUser;
-		global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang, $wgVariant;
-		global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
+	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 $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(
@@ -382,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(),
@@ -401,7 +403,6 @@ class Skin extends Linker {
 			'wgIsArticle' => $wgOut->isArticle(),
 			'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
 			'wgUserGroups' => $wgUser->isAnon() ? NULL : $wgUser->getEffectiveGroups(),
-			'wgUserVariant' => $wgVariant->getCode(),
 			'wgUserLanguage' => $wgLang->getCode(),
 			'wgContentLanguage' => $wgContLang->getCode(),
 			'wgBreakFrames' => $wgBreakFrames,
@@ -411,11 +412,22 @@ class Skin extends Linker {
 			'wgEnableWriteAPI' => $wgEnableWriteAPI,
 			'wgSeparatorTransformTable' => $compactSeparatorTransTable,
 			'wgDigitTransformTable' => $compactDigitTransTable,
+			'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
+			'wgFormattedNamespaces' => $wgContLang->getFormattedNamespaces(),
+			'wgNamespaceIds' => $wgContLang->getNamespaceIds(),
+			'wgSiteName' => $wgSitename,
 		);
-		if ( !( $wgContLang->hasVariants() ) ) {
-			unset( $vars['wgUserVariant'] );
+		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;
@@ -433,6 +445,17 @@ class Skin extends Linker {
 			$vars['wgLivepreviewMessageError']   = wfMsg( 'livepreview-error' );
 		}
 
+		//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 ) {
@@ -447,31 +470,6 @@ class Skin extends Linker {
 		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
@@ -481,16 +479,17 @@ class Skin extends Linker {
 	 *
 	 * @param string $action
 	 * @return bool
-	 * @private
 	 */
-	function userCanPreview( $action ) {
+	public function userCanPreview( $action ) {
 		global $wgRequest, $wgUser;
 
 		if( $action != 'submit' )
 			return false;
 		if( !$wgRequest->wasPosted() )
 			return false;
-		if( !$this->mTitle->userCanEditCssJsSubpage() )
+		if( !$this->mTitle->userCanEditCssSubpage() )
+			return false;
+		if( !$this->mTitle->userCanEditJsSubpage() )
 			return false;
 		return $wgUser->matchEditToken(
 			$wgRequest->getVal( 'wpEditToken' ) );
@@ -507,15 +506,20 @@ 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' );
@@ -523,10 +527,10 @@ class Skin extends Linker {
 			$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';
+		$msgKey = ucfirst( $skinName ) . '.js';
 		$userJS = wfMsgForContent( $msgKey );
 		if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
 			$s .= $userJS;
@@ -546,7 +550,7 @@ class Skin extends Linker {
 		wfProfileOut( __METHOD__ );
 		return $s;
 	}
-	
+
 	/**
 	 * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
 	 */
@@ -584,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;
 	}
 
@@ -604,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
@@ -644,9 +652,8 @@ END;
 			$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',
 					'action=raw&ctype=text/css' ) );
@@ -685,12 +692,12 @@ END;
 		$a['onload'] = $wgOut->getOnloadHandler();
 		$a['class'] =
 			'mediawiki' .
-			' '.( $wgContLang->isRTL() ? 'rtl' : 'ltr' ).
+			' '.( $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 ) {
@@ -749,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 .= "<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>";
@@ -793,7 +800,7 @@ END;
 
 		// 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>';
 
@@ -868,18 +875,21 @@ END;
 	}
 
 	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 ) {
@@ -929,13 +939,48 @@ END;
 	protected function generateDebugHTML() {
 		global $wgShowDebug, $wgOut;
 		if ( $wgShowDebug ) {
-			$listInternals = str_replace( "\n", "</li>\n<li>", htmlspecialchars( $wgOut->mDebugtext ) );
-			return "\n<hr>\n<strong>Debug data:</strong><ul style=\"font-family:monospace;\"><li>" .
-				$listInternals . "</li></ul>\n";
+			$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>
@@ -950,8 +995,7 @@ 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;
 	}
@@ -1073,9 +1117,13 @@ END;
 	function printableLink() {
 		global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
 
-		$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+		$s = array();
+
+		if ( !$wgOut->isPrintable() ) {
+			$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+			$s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
+		}
 
-		$s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
 		if( $wgOut->isSyndicated() ) {
 			foreach( $wgFeedClasses as $format => $class ) {
 				$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
@@ -1355,7 +1403,7 @@ END;
 					$element[] = $this->emailUserLink();
 				}
 			}
-			
+
 			$s = implode( $element, $sep );
 
 			if ( $this->mTitle->getArticleId() ) {
@@ -1444,8 +1492,9 @@ END;
 			return $out;
 		}
 		// Allow for site and per-namespace customization of copyright notice.
-		wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
-		
+		if( isset($wgArticle) )
+			wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
+
 		$out .= wfMsgForContent( $msg, $link );
 		return $out;
 	}
@@ -1462,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>';
 			}
@@ -1473,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();
@@ -1554,15 +1603,6 @@ END;
 		return $s;
 	}
 
-	function copyrightLink() {
-		$title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) );
-		$s = $this->linkKnown(
-			$title,
-			wfMsg( 'copyrightpagename' )
-		);
-		return $s;
-	}
-
 	private function footerLink ( $desc, $page ) {
 		// if the link description has been set to "-" in the default language,
 		if ( wfMsgForContent( $desc )  == '-') {
@@ -1627,7 +1667,7 @@ END;
 	function editUrlOptions() {
 		global $wgArticle;
 
-		$options = array( 'action' => 'edit' ); 
+		$options = array( 'action' => 'edit' );
 
 		if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
 			$options['oldid'] = intval( $this->mRevisionId );
@@ -1716,7 +1756,7 @@ END;
 				SpecialPage::getTitleFor( 'Movepage' ),
 				wfMsg( 'movethispage' ),
 				array(),
-				array( 'target' => $this->mTitle->getPrefixedURL() ),
+				array( 'target' => $this->mTitle->getPrefixedDBkey() ),
 				array( 'known', 'noclasses' )
 			);
 		} else {
@@ -1817,7 +1857,7 @@ 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>';
@@ -2051,4 +2091,16 @@ END;
 		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;
+	}
 }