I'm being bold here, proposed solution to:
[lhc/web/wiklou.git] / includes / Skin.php
index b0e72f0..8f7a950 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
@@ -176,15 +178,17 @@ class Skin extends Linker {
 
                wfProfileIn( __METHOD__ );
 
+               # Add favicons and Apple touch icons, if they're not the defaults
+               #
                # Generally the order of the favicon and apple-touch-icon links
                # should not matter, but Konqueror (3.5.9 at least) incorrectly
                # uses whichever one appears later in the HTML source.  Make sure
                # apple-touch-icon is specified first to avoid this.
-               if( false !== $wgAppleTouchIcon ) {
+               if( false !== $wgAppleTouchIcon && wfExpandUrl('/apple-touch-icon.png') != wfExpandUrl($wgAppleTouchIcon) ) {
                        $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
                }
 
-               if( false !== $wgFavicon ) {
+               if( false !== $wgFavicon && wfExpandUrl('/favicon.ico') != wfExpandUrl($wgFavicon) ) {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }
 
@@ -209,18 +213,18 @@ class Skin extends Linker {
         * Preload the existence of three commonly-requested pages in a single query
         */
        function preloadExistence() {
-               global $wgUser, $wgTitle;
+               global $wgUser;
 
                // User/talk link
                $titles = array( $wgUser->getUserPage(), $wgUser->getTalkPage() );
 
                // Other tab link
-               if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+               if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
                        // nothing
-               } elseif ( $wgTitle->isTalkPage() ) {
-                       $titles[] = $wgTitle->getSubjectPage();
+               } elseif ( $this->mTitle->isTalkPage() ) {
+                       $titles[] = $this->mTitle->getSubjectPage();
                } else {
-                       $titles[] = $wgTitle->getTalkPage();
+                       $titles[] = $this->mTitle->getTalkPage();
                }
 
                $lb = new LinkBatch( $titles );
@@ -228,7 +232,7 @@ class Skin extends Linker {
        }
 
        function addMetadataLinks( OutputPage $out ) {
-               global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
+               global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
                global $wgRightsPage, $wgRightsUrl;
 
                if( $out->isArticleRelated() ) {
@@ -237,14 +241,14 @@ class Skin extends Linker {
                                $out->addMetadataLink( array(
                                        'title' => 'Creative Commons',
                                        'type' => 'application/rdf+xml',
-                                       'href' => $wgTitle->getLocalURL( 'action=creativecommons' ) )
+                                       'href' => $this->mTitle->getLocalURL( 'action=creativecommons' ) )
                                );
                        }
                        if( $wgEnableDublinCoreRdf ) {
                                $out->addMetadataLink( array(
                                        'title' => 'Dublin Core',
                                        'type' => 'application/rdf+xml',
-                                       'href' => $wgTitle->getLocalURL( 'action=dublincore' ) )
+                                       'href' => $this->mTitle->getLocalURL( 'action=dublincore' ) )
                                );
                        }
                }
@@ -266,14 +270,29 @@ class Skin extends Linker {
                }
        }
 
-       function setMembers(){
-               global $wgTitle, $wgUser;
-               $this->mTitle = $wgTitle;
+       /**
+        * Set some local variables
+        */
+       protected function setMembers(){
+               global $wgUser;
                $this->mUser = $wgUser;
                $this->userpage = $wgUser->getUserPage()->getPrefixedText();
                $this->usercss = false;
        }
 
+       /**
+        * Set the title
+        * @param Title $t The title to use
+        */
+       public function setTitle( $t ) {
+               $this->mTitle = $t;
+       }
+
+       /** Get the title */
+       public function getTitle() {
+               return $this->mTitle;
+       }
+
        function outputPage( OutputPage $out ) {
                global $wgDebugComments;
                wfProfileIn( __METHOD__ );
@@ -302,7 +321,7 @@ class Skin extends Linker {
                $out->out( $out->mBodytext . "\n" );
 
                $out->out( $this->afterContent() );
-               
+
                $out->out( $afterContent );
 
                $out->out( $this->bottomScripts() );
@@ -322,20 +341,23 @@ class Skin extends Linker {
                        $r[] = "var $name = $encValue;";
                }
                $r[] = "/*]]>*/</script>\n";
-
                return implode( "\n\t\t", $r );
        }
 
        /**
         * Make a <script> tag containing global variables
-        * @param array $data Associative array containing one element:
-        *     skinname => the skin name
+        * @param $skinName string Name of the skin
         * The odd calling convention is for backwards compatibility
+        * @TODO @FIXME Make this not depend on $wgTitle!
         */
-       static function makeGlobalVariablesScript( $data ) {
-               global $wgScript, $wgStylePath, $wgUser;
-               global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
-               global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
+       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, $wgVariant;
+               global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
                global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
                global $wgUseAjax, $wgAjaxWatch;
                global $wgVersion, $wgEnableAPI, $wgEnableWriteAPI;
@@ -358,7 +380,7 @@ class Skin extends Linker {
                );
 
                $vars = array(
-                       'skin' => $data['skinname'],
+                       'skin' => $skinName,
                        'stylepath' => $wgStylePath,
                        'wgArticlePath' => $wgArticlePath,
                        'wgScriptPath' => $wgScriptPath,
@@ -376,6 +398,7 @@ 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,
@@ -386,7 +409,17 @@ class Skin extends Linker {
                        'wgSeparatorTransformTable' => $compactSeparatorTransTable,
                        'wgDigitTransformTable' => $compactDigitTransTable,
                );
-               
+               if ( !( $wgContLang->hasVariants() ) ) {
+                       unset( $vars['wgUserVariant'] );
+               }
+
+               //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;
@@ -417,30 +450,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 "\t" . $vars . "\t" . $out->mScripts;
        }
 
        /**
@@ -455,13 +499,13 @@ class Skin extends Linker {
         * @private
         */
        function userCanPreview( $action ) {
-               global $wgTitle, $wgRequest, $wgUser;
+               global $wgRequest, $wgUser;
 
                if( $action != 'submit' )
                        return false;
                if( !$wgRequest->wasPosted() )
                        return false;
-               if( !$wgTitle->userCanEditCssJsSubpage() )
+               if( !$this->mTitle->userCanEditCssJsSubpage() )
                        return false;
                return $wgUser->matchEditToken(
                        $wgRequest->getVal( 'wpEditToken' ) );
@@ -478,15 +522,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' );
@@ -494,10 +543,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;
@@ -517,7 +566,7 @@ class Skin extends Linker {
                wfProfileOut( __METHOD__ );
                return $s;
        }
-       
+
        /**
         * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
         */
@@ -555,6 +604,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;
        }
 
@@ -639,17 +692,17 @@ END;
        }
 
        function getBodyOptions() {
-               global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
+               global $wgUser, $wgOut, $wgRequest, $wgContLang;
 
                extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
 
-               if ( 0 != $wgTitle->getNamespace() ) {
+               if ( 0 != $this->mTitle->getNamespace() ) {
                        $a = array( 'bgcolor' => '#ffffec' );
                }
                else $a = array( 'bgcolor' => '#FFFFFF' );
                if( $wgOut->isArticle() && $wgUser->getOption( 'editondblclick' ) &&
-                 $wgTitle->quickUserCan( 'edit' ) ) {
-                       $s = $wgTitle->getFullURL( $this->editUrlOptions() );
+                 $this->mTitle->quickUserCan( 'edit' ) ) {
+                       $s = $this->mTitle->getFullURL( $this->editUrlOptions() );
                        $s = 'document.location = "' .Xml::escapeJsString( $s ) .'";';
                        $a += array( 'ondblclick' => $s );
                }
@@ -657,11 +710,11 @@ END;
                $a['class'] =
                        'mediawiki' .
                        ' '.( $wgContLang->isRTL() ? 'rtl' : 'ltr' ).
-                       ' '.$this->getPageClasses( $wgTitle ) .
+                       ' '.$this->getPageClasses( $this->mTitle ) .
                        ' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
                return $a;
        }
-       
+
        function getPageClasses( $title ) {
                $numeric = 'ns-'.$title->getNamespace();
                if( $title->getNamespace() == NS_SPECIAL ) {
@@ -754,7 +807,7 @@ END;
 
 
        function getCategoryLinks() {
-               global $wgOut, $wgTitle, $wgUseCategoryBrowser;
+               global $wgOut, $wgUseCategoryBrowser;
                global $wgContLang, $wgUser;
 
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
@@ -784,7 +837,7 @@ END;
                if ( isset( $allCats['hidden'] ) ) {
                        if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
                                $class ='mw-hidden-cats-user-shown';
-                       } elseif ( $wgTitle->getNamespace() == NS_CATEGORY ) {
+                       } elseif ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
                                $class = 'mw-hidden-cats-ns-shown';
                        } else {
                                $class = 'mw-hidden-cats-hidden';
@@ -801,7 +854,7 @@ END;
                        $s .= '<br /><hr />';
 
                        # get a big array of the parents tree
-                       $parenttree = $wgTitle->getParentCategoryTree();
+                       $parenttree = $this->mTitle->getParentCategoryTree();
                        # Skin object passed by reference cause it can not be
                        # accessed under the method subfunction drawCategoryBrowser
                        $tempout = explode( "\n", Skin::drawCategoryBrowser( $parenttree, $this ) );
@@ -929,8 +982,7 @@ END;
 
        /** @return string Retrievied from HTML text */
        function printSource() {
-               global $wgTitle;
-               $url = htmlspecialchars( $wgTitle->getFullURL() );
+               $url = htmlspecialchars( $this->mTitle->getFullURL() );
                return wfMsg( 'retrievedfrom', '<a href="'.$url.'">'.$url.'</a>' );
        }
 
@@ -943,7 +995,7 @@ END;
        function doAfterContent() { return '</div></div>'; }
 
        function pageTitleLinks() {
-               global $wgOut, $wgTitle, $wgUser, $wgRequest, $wgLang;
+               global $wgOut, $wgUser, $wgRequest, $wgLang;
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
@@ -960,9 +1012,9 @@ END;
                }
 
                if ( $wgOut->isArticleRelated() ) {
-                       if ( $wgTitle->getNamespace() == NS_FILE ) {
-                               $name = $wgTitle->getDBkey();
-                               $image = wfFindFile( $wgTitle );
+                       if ( $this->mTitle->getNamespace() == NS_FILE ) {
+                               $name = $this->mTitle->getDBkey();
+                               $image = wfFindFile( $this->mTitle );
                                if( $image ) {
                                        $link = htmlspecialchars( $image->getURL() );
                                        $style = $this->getInternalLinkAttributes( $link, $name );
@@ -971,16 +1023,34 @@ END;
                        }
                }
                if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-                       $s[] .= $this->makeKnownLinkObj( $wgTitle,
-                                       wfMsg( 'currentrev' ) );
+                       $s[] .= $this->link(
+                                       $this->mTitle,
+                                       wfMsg( 'currentrev' ),
+                                       array(),
+                                       array(),
+                                       array( 'known', 'noclasses' )
+                       );
                }
 
                if ( $wgUser->getNewtalk() ) {
                        # do not show "You have new messages" text when we are viewing our
                        # own talk page
-                       if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
-                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
-                               $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
+                       if( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) {
+                               $tl = $this->link(
+                                       $wgUser->getTalkPage(),
+                                       wfMsgHtml( 'newmessageslink' ),
+                                       array(),
+                                       array( 'redirect' => 'no' ),
+                                       array( 'known', 'noclasses' )
+                               );
+
+                               $dl = $this->link(
+                                       $wgUser->getTalkPage(),
+                                       wfMsgHtml( 'newmessagesdifflink' ),
+                                       array(),
+                                       array( 'diff' => 'cur' ),
+                                       array( 'known', 'noclasses' )
+                               );
                                $s[] = '<strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
                                # disable caching
                                $wgOut->setSquidMaxage( 0 );
@@ -996,19 +1066,30 @@ END;
        }
 
        function getUndeleteLink() {
-               global $wgUser, $wgTitle, $wgContLang, $wgLang, $action;
-               if(     $wgUser->isAllowed( 'deletedhistory' ) &&
-                       ( ( $wgTitle->getArticleId() == 0 ) || ( $action == 'history' ) ) &&
-                       ( $n = $wgTitle->isDeleted() ) ){
-                       if ( $wgUser->isAllowed( 'undelete' ) ) {
-                               $msg = 'thisisdeleted';
-                       } else {
-                               $msg = 'viewdeleted';
+               global $wgUser, $wgContLang, $wgLang, $wgRequest;
+
+               $action = $wgRequest->getVal( 'action', 'view' );
+
+               if ( $wgUser->isAllowed( 'deletedhistory' ) &&
+                       ( $this->mTitle->getArticleId() == 0 || $action == 'history' ) ) {
+                       $n = $this->mTitle->isDeleted();
+                       if ( $n ) {
+                               if ( $wgUser->isAllowed( 'undelete' ) ) {
+                                       $msg = 'thisisdeleted';
+                               } else {
+                                       $msg = 'viewdeleted';
+                               }
+                               return wfMsg(
+                                       $msg,
+                                       $this->link(
+                                               SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
+                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ),
+                                               array(),
+                                               array(),
+                                               array( 'known', 'noclasses' )
+                                       )
+                               );
                        }
-                       return wfMsg( $msg,
-                               $this->makeKnownLinkObj(
-                                       SpecialPage::getTitleFor( 'Undelete', $wgTitle->getPrefixedDBkey() ),
-                                       wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ) ) );
                }
                return '';
        }
@@ -1016,9 +1097,13 @@ END;
        function printableLink() {
                global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
 
-               $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+               $s = array();
+
+               if ( !$wgRequest->getBool( 'printable' ) ) {
+                       $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" );
@@ -1054,9 +1139,9 @@ END;
                if( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) )
                        return $subpages;
 
-               global $wgOut, $wgTitle;
-               if( $wgOut->isArticle() && MWNamespace::hasSubpages( $wgTitle->getNamespace() ) ) {
-                       $ptext = $wgTitle->getPrefixedText();
+               global $wgOut;
+               if( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
+                       $ptext = $this->mTitle->getPrefixedText();
                        if( preg_match( '/\//', $ptext ) ) {
                                $links = explode( '/', $ptext );
                                array_pop( $links );
@@ -1068,7 +1153,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' );
@@ -1096,7 +1187,7 @@ END;
        }
 
        function nameAndLogin() {
-               global $wgUser, $wgTitle, $wgLang, $wgContLang;
+               global $wgUser, $wgLang, $wgContLang;
 
                $logoutPage = $wgContLang->specialPage( 'Userlogout' );
 
@@ -1113,7 +1204,7 @@ END;
                                $ret .= wfMsg( 'notloggedin' );
                        }
 
-                       $returnTo = $wgTitle->getPrefixedDBkey();
+                       $returnTo = $this->mTitle->getPrefixedDBkey();
                        $query = array();
                        if ( $logoutPage != $returnTo ) {
                                $query['returnto'] = $returnTo;
@@ -1127,7 +1218,7 @@ END;
                                wfMsg( $loginlink ), array(), $query
                        );
                } else {
-                       $returnTo = $wgTitle->getPrefixedDBkey();
+                       $returnTo = $this->mTitle->getPrefixedDBkey();
                        $talkLink = $this->link( $wgUser->getTalkPage(),
                                $wgLang->getNsText( NS_TALK ) );
 
@@ -1246,7 +1337,7 @@ END;
        function variantLinks() {
                $s = '';
                /* show links to different language variants */
-               global $wgDisableLangConversion, $wgLang, $wgContLang, $wgTitle;
+               global $wgDisableLangConversion, $wgLang, $wgContLang;
                $variants = $wgContLang->getVariants();
                if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
                        foreach( $variants as $code ) {
@@ -1255,7 +1346,7 @@ END;
                                        continue;
                                $s = $wgLang->pipeList( array(
                                        $s,
-                                       '<a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
+                                       '<a href="' . $this->mTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
                                ) );
                        }
                }
@@ -1263,7 +1354,7 @@ END;
        }
 
        function bottomLinks() {
-               global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks;
+               global $wgOut, $wgUser, $wgUseTrackbacks;
                $sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n";
 
                $s = '';
@@ -1280,10 +1371,10 @@ END;
                        if( $wgUseTrackbacks )
                                $element[] = $this->trackbackLink();
 
-                       if ( $wgTitle->getNamespace() == NS_USER
-                           || $wgTitle->getNamespace() == NS_USER_TALK ){
-                               $id = User::idFromName( $wgTitle->getText() );
-                               $ip = User::isIP( $wgTitle->getText() );
+                       if ( $this->mTitle->getNamespace() == NS_USER
+                           || $this->mTitle->getNamespace() == NS_USER_TALK ){
+                               $id = User::idFromName( $this->mTitle->getText() );
+                               $ip = User::isIP( $this->mTitle->getText() );
 
                                if( $id || $ip ) { # both anons and non-anons have contri list
                                        $element[] = $this->userContribsLink();
@@ -1292,10 +1383,10 @@ END;
                                        $element[] = $this->emailUserLink();
                                }
                        }
-                       
+
                        $s = implode( $element, $sep );
 
-                       if ( $wgTitle->getArticleId() ) {
+                       if ( $this->mTitle->getArticleId() ) {
                                $s .= "\n<br />";
                                if( $wgUser->isAllowed( 'delete' ) ) { $s .= $this->deleteThisPage(); }
                                if( $wgUser->isAllowed( 'protect' ) ) { $s .= $sep . $this->protectThisPage(); }
@@ -1309,7 +1400,7 @@ END;
 
        function pageStats() {
                global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
-               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgTitle, $wgPageShowWatchingUsers;
+               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgPageShowWatchingUsers;
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
@@ -1336,7 +1427,7 @@ END;
                        $dbr = wfGetDB( DB_SLAVE );
                        $res = $dbr->select( 'watchlist',
                                array( 'COUNT(*) AS n' ),
-                               array( 'wl_title' => $dbr->strencode( $wgTitle->getDBkey() ), 'wl_namespace' => $wgTitle->getNamespace() ),
+                               array( 'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ), 'wl_namespace' => $this->mTitle->getNamespace() ),
                                __METHOD__
                        );
                        $x = $dbr->fetchObject( $res );
@@ -1370,7 +1461,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 ) {
@@ -1379,6 +1471,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;
        }
@@ -1477,13 +1573,22 @@ END;
        }
 
        function mainPageLink() {
-               $s = $this->makeKnownLinkObj( Title::newMainPage(), wfMsg( 'mainpage' ) );
+               $s = $this->link(
+                       Title::newMainPage(),
+                       wfMsg( 'mainpage' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
                return $s;
        }
 
        function copyrightLink() {
-               $s = $this->makeKnownLink( wfMsgForContent( 'copyrightpage' ),
-                 wfMsg( 'copyrightpagename' ) );
+               $title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) );
+               $s = $this->linkKnown(
+                       $title,
+                       wfMsg( 'copyrightpagename' )
+               );
                return $s;
        }
 
@@ -1496,8 +1601,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' ) )
+                       );
                }
        }
 
@@ -1514,20 +1622,26 @@ END;
        }
 
        function editThisPage() {
-               global $wgOut, $wgTitle;
+               global $wgOut;
 
                if ( !$wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
                } else {
-                       if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() ) {
+                       if( $this->mTitle->quickUserCan( 'edit' ) && $this->mTitle->exists() ) {
                                $t = wfMsg( 'editthispage' );
-                       } elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() ) {
+                       } elseif( $this->mTitle->quickUserCan( 'create' ) && !$this->mTitle->exists() ) {
                                $t = wfMsg( 'create-this-page' );
                        } else {
                                $t = wfMsg( 'viewsource' );
                        }
 
-                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $this->editUrlOptions() );
+                       $s = $this->link(
+                               $this->mTitle,
+                               $t,
+                               array(),
+                               $this->editUrlOptions(),
+                               array( 'known', 'noclasses' )
+                       );
                }
                return $s;
        }
@@ -1536,27 +1650,35 @@ END;
         * Return URL options for the 'edit page' link.
         * This may include an 'oldid' specifier, if the current page view is such.
         *
-        * @return string
+        * @return array
         * @private
         */
        function editUrlOptions() {
                global $wgArticle;
 
+               $options = array( 'action' => 'edit' );
+
                if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
-                       return 'action=edit&oldid=' . intval( $this->mRevisionId );
-               } else {
-                       return 'action=edit';
+                       $options['oldid'] = intval( $this->mRevisionId );
                }
+
+               return $options;
        }
 
        function deleteThisPage() {
-               global $wgUser, $wgTitle, $wgRequest;
+               global $wgUser, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
-               if ( $wgTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
+               if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
                        $t = wfMsg( 'deletethispage' );
 
-                       $s = $this->makeKnownLinkObj( $wgTitle, $t, 'action=delete' );
+                       $s = $this->link(
+                               $this->mTitle,
+                               $t,
+                               array(),
+                               array( 'action' => 'delete' ),
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        $s = '';
                }
@@ -1564,18 +1686,25 @@ END;
        }
 
        function protectThisPage() {
-               global $wgUser, $wgTitle, $wgRequest;
+               global $wgUser, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
-               if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
-                       if ( $wgTitle->isProtected() ) {
-                               $t = wfMsg( 'unprotectthispage' );
-                               $q = 'action=unprotect';
+               if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
+                       if ( $this->mTitle->isProtected() ) {
+                               $text = wfMsg( 'unprotectthispage' );
+                               $query = array( 'action' => 'unprotect' );
                        } else {
-                               $t = wfMsg( 'protectthispage' );
-                               $q = 'action=protect';
+                               $text = wfMsg( 'protectthispage' );
+                               $query = array( 'action' => 'protect' );
                        }
-                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
+
+                       $s = $this->link(
+                               $this->mTitle,
+                               $text,
+                               array(),
+                               $query,
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        $s = '';
                }
@@ -1583,20 +1712,27 @@ END;
        }
 
        function watchThisPage() {
-               global $wgOut, $wgTitle;
+               global $wgOut;
                ++$this->mWatchLinkNum;
 
                if ( $wgOut->isArticleRelated() ) {
-                       if ( $wgTitle->userIsWatching() ) {
-                               $t = wfMsg( 'unwatchthispage' );
-                               $q = 'action=unwatch';
+                       if ( $this->mTitle->userIsWatching() ) {
+                               $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( $wgTitle, $t, $q, '', '', " id=\"$id\"" );
+
+                       $s = $this->link(
+                               $this->mTitle,
+                               $text,
+                               array( 'id' => $id ),
+                               $query,
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        $s = wfMsg( 'notanarticle' );
                }
@@ -1604,11 +1740,14 @@ END;
        }
 
        function moveThisPage() {
-               global $wgTitle;
-
-               if ( $wgTitle->quickUserCan( 'move' ) ) {
-                       return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
-                         wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
+               if ( $this->mTitle->quickUserCan( 'move' ) ) {
+                       return $this->link(
+                               SpecialPage::getTitleFor( 'Movepage' ),
+                               wfMsg( 'movethispage' ),
+                               array(),
+                               array( 'target' => $this->mTitle->getPrefixedDBkey() ),
+                               array( 'known', 'noclasses' )
+                       );
                } else {
                        // no message if page is protected - would be redundant
                        return '';
@@ -1616,26 +1755,32 @@ END;
        }
 
        function historyLink() {
-               global $wgTitle;
-
-               return $this->link( $wgTitle, wfMsg( 'history' ),
-                       array( 'rel' => 'archives' ), array( 'action' => 'history' ) );
+               return $this->link(
+                       $this->mTitle,
+                       wfMsgHtml( 'history' ),
+                       array( 'rel' => 'archives' ),
+                       array( 'action' => 'history' )
+               );
        }
 
        function whatLinksHere() {
-               global $wgTitle;
-
-               return $this->makeKnownLinkObj(
-                       SpecialPage::getTitleFor( 'Whatlinkshere', $wgTitle->getPrefixedDBkey() ),
-                       wfMsg( 'whatlinkshere' ) );
+               return $this->link(
+                       SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
+                       wfMsgHtml( 'whatlinkshere' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
        }
 
        function userContribsLink() {
-               global $wgTitle;
-
-               return $this->makeKnownLinkObj(
-                       SpecialPage::getTitleFor( 'Contributions', $wgTitle->getDBkey() ),
-                       wfMsg( 'contributions' ) );
+               return $this->link(
+                       SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
+                       wfMsgHtml( 'contributions' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
        }
 
        function showEmailUser( $id ) {
@@ -1646,29 +1791,32 @@ END;
        }
 
        function emailUserLink() {
-               global $wgTitle;
-
-               return $this->makeKnownLinkObj(
-                       SpecialPage::getTitleFor( 'Emailuser', $wgTitle->getDBkey() ),
-                       wfMsg( 'emailuser' ) );
+               return $this->link(
+                       SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
+                       wfMsg( 'emailuser' ),
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               );
        }
 
        function watchPageLinksLink() {
-               global $wgOut, $wgTitle;
-
+               global $wgOut;
                if ( ! $wgOut->isArticleRelated() ) {
                        return '(' . wfMsg( 'notanarticle' ) . ')';
                } else {
-                       return $this->makeKnownLinkObj(
-                               SpecialPage::getTitleFor( 'Recentchangeslinked', $wgTitle->getPrefixedDBkey() ),
-                               wfMsg( 'recentchangeslinked' ) );
+                       return $this->link(
+                               SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
+                               wfMsg( 'recentchangeslinked-toolbox' ),
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       );
                }
        }
 
        function trackbackLink() {
-               global $wgTitle;
-
-               return '<a href="' . $wgTitle->trackbackURL() . '">'
+               return '<a href="' . $this->mTitle->trackbackURL() . '">'
                        . wfMsg( 'trackbacklink' ) . '</a>';
        }
 
@@ -1698,7 +1846,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>';
@@ -1706,17 +1854,15 @@ END;
        }
 
        function talkLink() {
-               global $wgTitle;
-
-               if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
+               if ( NS_SPECIAL == $this->mTitle->getNamespace() ) {
                        # No discussion links for special pages
                        return '';
                }
 
                $linkOptions = array();
 
-               if( $wgTitle->isTalkPage() ) {
-                       $link = $wgTitle->getSubjectPage();
+               if( $this->mTitle->isTalkPage() ) {
+                       $link = $this->mTitle->getSubjectPage();
                        switch( $link->getNamespace() ) {
                                case NS_MAIN:
                                        $text = wfMsg( 'articlepage' );
@@ -1749,7 +1895,7 @@ END;
                                        $text = wfMsg( 'articlepage' );
                        }
                } else {
-                       $link = $wgTitle->getTalkPage();
+                       $link = $this->mTitle->getTalkPage();
                        $text = wfMsg( 'talkpage' );
                }
 
@@ -1759,24 +1905,33 @@ END;
        }
 
        function commentLink() {
-               global $wgTitle, $wgOut;
+               global $wgOut;
 
-               if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+               if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
                        return '';
                }
 
                # __NEWSECTIONLINK___ changes behaviour here
-               # If it's present, the link points to this page, otherwise
+               # If it is present, the link points to this page, otherwise
                # it points to the talk page
-               if( $wgTitle->isTalkPage() ) {
-                       $title = $wgTitle;
+               if( $this->mTitle->isTalkPage() ) {
+                       $title = $this->mTitle;
                } elseif( $wgOut->showNewSectionLink() ) {
-                       $title = $wgTitle;
+                       $title = $this->mTitle;
                } else {
-                       $title = $wgTitle->getTalkPage();
+                       $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 */
@@ -1884,8 +2039,7 @@ END;
                        if( strpos( $line, '*' ) !== 0 )
                                continue;
                        if( strpos( $line, '**') !== 0 ) {
-                               $line = trim( $line, '* ' );
-                               $heading = $line;
+                               $heading = trim( $line, '* ' );
                                if( !array_key_exists( $heading, $bar ) ) $bar[$heading] = array();
                        } else {
                                if( strpos( $line, '|' ) !== false ) { // sanity check
@@ -1926,4 +2080,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;
+       }
 }
\ No newline at end of file