Removed old comment and depreciated <tt> tags
[lhc/web/wiklou.git] / includes / Skin.php
index 39d93dd..9118db9 100644 (file)
@@ -24,6 +24,8 @@ class Skin extends Linker {
        /**#@-*/
        protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
        protected $skinname = 'standard';
+       // @fixme Should be protected :-\
+       var $mTitle = null;
 
        /** Constructor, call parent constructor */
        function Skin() { parent::__construct(); }
@@ -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
@@ -275,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
@@ -284,6 +286,11 @@ class Skin extends Linker {
                $this->mTitle = $t;
        }
 
+       /** Get the title */
+       public function getTitle() {
+               return $this->mTitle;
+       }
+
        function outputPage( OutputPage $out ) {
                global $wgDebugComments;
                wfProfileIn( __METHOD__ );
@@ -312,7 +319,7 @@ class Skin extends Linker {
                $out->out( $out->mBodytext . "\n" );
 
                $out->out( $this->afterContent() );
-               
+
                $out->out( $afterContent );
 
                $out->out( $this->bottomScripts() );
@@ -324,26 +331,30 @@ 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 ) {
+       static function makeGlobalVariablesScript( $skinName ) {
+               if ( is_array( $skinName ) ) {
+                       # Weird back-compat stuff.
+                       $skinName = $skinName['skinname'];
+               }
                global $wgScript, $wgTitle, $wgStylePath, $wgUser;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
                global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
@@ -368,8 +379,9 @@ class Skin extends Linker {
                        implode( "\t", $digitTransTable ),
                );
 
+               $mainPage = Title::newFromText( wfMsgForContent( 'mainpage' ) );
                $vars = array(
-                       'skin' => $data['skinname'],
+                       'skin' => $skinName,
                        'stylepath' => $wgStylePath,
                        'wgArticlePath' => $wgArticlePath,
                        'wgScriptPath' => $wgScriptPath,
@@ -396,8 +408,19 @@ class Skin extends Linker {
                        'wgEnableWriteAPI' => $wgEnableWriteAPI,
                        'wgSeparatorTransformTable' => $compactSeparatorTransTable,
                        'wgDigitTransformTable' => $compactDigitTransTable,
+                       'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
                );
-               
+               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;
@@ -428,30 +451,41 @@ class Skin extends Linker {
 
                return self::makeVariablesScript( $vars );
        }
+       /**
+        * Return a random selection of the scripts we want in the header, 
+        * according to no particular rhyme or reason.  Various other scripts are 
+        * returned from a haphazard assortment of other functions scattered over 
+        * various files.  This entire hackish system needs to be burned to the 
+        * ground and rebuilt.
+        *
+        * @param $out OutputPage object, should be $wgOut
+        *
+        * @return string Raw HTML to output to <head>
+        */
+       function getHeadScripts( OutputPage $out ) {
+               global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion, $wgOut;
+               global $wgUseSiteJs;
 
-       function getHeadScripts( $allowUserJs ) {
-               global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
-
-               $vars = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
+               $vars = self::makeGlobalVariablesScript( $this->getSkinName() );
 
-               $r = array( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>" );
-               global $wgUseSiteJs;
+               //moved wikibits to be called earlier on
+               //$out->addScriptFile( "{$wgStylePath}/common/wikibits.js" );
                if( $wgUseSiteJs ) {
                        $jsCache = $wgUser->isLoggedIn() ? '&smaxage=0' : '';
-                       $r[] = "<script type=\"$wgJsMimeType\" src=\"".
-                               htmlspecialchars( self::makeUrl( '-',
+                       $wgOut->addScriptFile(  self::makeUrl( '-',
                                        "action=raw$jsCache&gen=js&useskin=" .
-                                       urlencode( $this->getSkinName() ) ) ) .
-                               "\"><!-- site js --></script>";
+                                       urlencode( $this->getSkinName() )
+                                       )
+                               );
                }
-               if( $allowUserJs && $wgUser->isLoggedIn() ) {
+               if( $out->isUserJsAllowed() && $wgUser->isLoggedIn() ) {
                        $userpage = $wgUser->getUserPage();
-                       $userjs = htmlspecialchars( self::makeUrl(
+                       $userjs =  self::makeUrl(
                                $userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
-                               'action=raw&ctype='.$wgJsMimeType ) );
-                       $r[] = '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>";
+                               'action=raw&ctype='.$wgJsMimeType );
+                       $wgOut->addScriptFile( $userjs );
                }
-               return $vars . "\t\t" . implode ( "\n\t\t", $r );
+               return $vars . "\n" . $out->mScripts;
        }
 
        /**
@@ -472,7 +506,9 @@ class Skin extends Linker {
                        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' ) );
@@ -489,15 +525,20 @@ class Skin extends Linker {
         * top.  For now Monobook.js will be maintained, but it should be consi-
         * dered deprecated.
         *
+        * @param force_skin  lets you override 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' );
@@ -505,10 +546,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;
@@ -528,7 +569,7 @@ class Skin extends Linker {
                wfProfileOut( __METHOD__ );
                return $s;
        }
-       
+
        /**
         * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
         */
@@ -566,6 +607,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;
        }
 
@@ -586,8 +631,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
@@ -667,12 +712,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 ) {
@@ -731,13 +776,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>";
@@ -775,7 +820,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>';
 
@@ -854,14 +899,11 @@ END;
 
                $classes = 'catlinks';
 
-               if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false &&
-                       strpos( $catlinks, '<div id="mw-hidden-catlinks" class="mw-hidden-cats-hidden">' ) !== false ) {
+               if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false ) {
                        $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 ) {
@@ -932,8 +974,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;
        }
@@ -981,16 +1022,34 @@ END;
                        }
                }
                if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-                       $s[] .= $this->makeKnownLinkObj( $this->mTitle,
-                                       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( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) {
-                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
-                               $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
+                               $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 );
@@ -1006,19 +1065,30 @@ END;
        }
 
        function getUndeleteLink() {
-               global $wgUser, $wgContLang, $wgLang, $action;
-               if(     $wgUser->isAllowed( 'deletedhistory' ) &&
-                       ( ( $this->mTitle->getArticleId() == 0 ) || ( $action == 'history' ) ) &&
-                       ( $n = $this->mTitle->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', $this->mTitle->getPrefixedDBkey() ),
-                                       wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ) ) );
                }
                return '';
        }
@@ -1026,9 +1096,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" );
@@ -1078,7 +1152,13 @@ END;
                                        $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 .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
@@ -1302,7 +1382,7 @@ END;
                                        $element[] = $this->emailUserLink();
                                }
                        }
-                       
+
                        $s = implode( $element, $sep );
 
                        if ( $this->mTitle->getArticleId() ) {
@@ -1380,7 +1460,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 ) {
@@ -1389,6 +1470,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;
        }
@@ -1405,7 +1490,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>';
                        }
@@ -1416,7 +1501,7 @@ 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;
        }
 
@@ -1487,13 +1572,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;
        }
 
@@ -1506,8 +1591,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' ) )
+                       );
                }
        }
 
@@ -1537,7 +1625,13 @@ END;
                                $t = wfMsg( 'viewsource' );
                        }
 
-                       $s = $this->makeKnownLinkObj( $this->mTitle, $t, $this->editUrlOptions() );
+                       $s = $this->link(
+                               $this->mTitle,
+                               $t,
+                               array(),
+                               $this->editUrlOptions(),
+                               array( 'known', 'noclasses' )
+                       );
                }
                return $s;
        }
@@ -1546,17 +1640,19 @@ 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() {
@@ -1566,7 +1662,13 @@ END;
                if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
                        $t = wfMsg( 'deletethispage' );
 
-                       $s = $this->makeKnownLinkObj( $this->mTitle, $t, 'action=delete' );
+                       $s = $this->link(
+                               $this->mTitle,
+                               $t,
+                               array(),
+                               array( 'action' => 'delete' ),
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        $s = '';
                }
@@ -1579,13 +1681,20 @@ END;
                $diff = $wgRequest->getVal( 'diff' );
                if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
                        if ( $this->mTitle->isProtected() ) {
-                               $t = wfMsg( 'unprotectthispage' );
-                               $q = 'action=unprotect';
+                               $text = wfMsg( 'unprotectthispage' );
+                               $query = array( 'action' => 'unprotect' );
                        } else {
-                               $t = wfMsg( 'protectthispage' );
-                               $q = 'action=protect';
+                               $text = wfMsg( 'protectthispage' );
+                               $query = array( 'action' => 'protect' );
                        }
-                       $s = $this->makeKnownLinkObj( $this->mTitle, $t, $q );
+
+                       $s = $this->link(
+                               $this->mTitle,
+                               $text,
+                               array(),
+                               $query,
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        $s = '';
                }
@@ -1598,15 +1707,22 @@ END;
 
                if ( $wgOut->isArticleRelated() ) {
                        if ( $this->mTitle->userIsWatching() ) {
-                               $t = wfMsg( 'unwatchthispage' );
-                               $q = 'action=unwatch';
+                               $text = wfMsg( 'unwatchthispage' );
+                               $query = array( 'action' => 'unwatch' );
                                $id = 'mw-unwatch-link' . $this->mWatchLinkNum;
                        } else {
-                               $t = wfMsg( 'watchthispage' );
-                               $q = 'action=watch';
+                               $text = wfMsg( 'watchthispage' );
+                               $query = array( 'action' => 'watch' );
                                $id = 'mw-watch-link' . $this->mWatchLinkNum;
                        }
-                       $s = $this->makeKnownLinkObj( $this->mTitle, $t, $q, '', '', " id=\"$id\"" );
+
+                       $s = $this->link(
+                               $this->mTitle,
+                               $text,
+                               array( 'id' => $id ),
+                               $query,
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        $s = wfMsg( 'notanarticle' );
                }
@@ -1615,8 +1731,13 @@ END;
 
        function moveThisPage() {
                if ( $this->mTitle->quickUserCan( 'move' ) ) {
-                       return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
-                         wfMsg( 'movethispage' ), 'target=' . $this->mTitle->getPrefixedURL() );
+                       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 '';
@@ -1624,20 +1745,32 @@ END;
        }
 
        function historyLink() {
-               return $this->link( $this->mTitle, wfMsg( 'history' ),
-                       array( 'rel' => 'archives' ), array( 'action' => 'history' ) );
+               return $this->link(
+                       $this->mTitle,
+                       wfMsgHtml( 'history' ),
+                       array( 'rel' => 'archives' ),
+                       array( 'action' => 'history' )
+               );
        }
 
        function whatLinksHere() {
-               return $this->makeKnownLinkObj(
+               return $this->link(
                        SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
-                       wfMsg( 'whatlinkshere' ) );
+                       wfMsgHtml( 'whatlinkshere' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
        }
 
        function userContribsLink() {
-               return $this->makeKnownLinkObj(
+               return $this->link(
                        SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
-                       wfMsg( 'contributions' ) );
+                       wfMsgHtml( 'contributions' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
        }
 
        function showEmailUser( $id ) {
@@ -1648,9 +1781,13 @@ END;
        }
 
        function emailUserLink() {
-               return $this->makeKnownLinkObj(
+               return $this->link(
                        SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
-                       wfMsg( 'emailuser' ) );
+                       wfMsg( 'emailuser' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
        }
 
        function watchPageLinksLink() {
@@ -1658,9 +1795,13 @@ END;
                if ( ! $wgOut->isArticleRelated() ) {
                        return '(' . wfMsg( 'notanarticle' ) . ')';
                } else {
-                       return $this->makeKnownLinkObj(
+                       return $this->link(
                                SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
-                               wfMsg( 'recentchangeslinked' ) );
+                               wfMsg( 'recentchangeslinked-toolbox' ),
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       );
                }
        }
 
@@ -1695,7 +1836,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>';
@@ -1761,7 +1902,7 @@ END;
                }
 
                # __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( $this->mTitle->isTalkPage() ) {
                        $title = $this->mTitle;
@@ -1771,7 +1912,16 @@ END;
                        $title = $this->mTitle->getTalkPage();
                }
 
-               return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit&section=new' );
+               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 */
@@ -1920,4 +2070,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;
+       }
 }