More function level documentation
[lhc/web/wiklou.git] / includes / Skin.php
index 001f67f..f3e5669 100644 (file)
@@ -15,18 +15,21 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  *
  * @ingroup Skins
  */
-class Skin extends Linker {
+abstract class Skin extends Linker {
        /**#@+
         * @private
         */
        var $mWatchLinkNum = 0; // Appended to end of watch link id's
-       // How many search boxes have we made?  Avoid duplicate id's.
-       protected $searchboxes = '';
        /**#@-*/
        protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
        protected $skinname = 'standard';
-       // @todo Fixme: should be protected :-\
+       /**
+        * todo Fixme: should be protected :-\
+        * @var Title
+        */
        var $mTitle = null;
+       protected $mRelevantTitle = null;
+       protected $mRelevantUser = null;
 
        /** Constructor, call parent constructor */
        function __construct() {
@@ -40,20 +43,24 @@ class Skin extends Linker {
        static function getSkinNames() {
                global $wgValidSkinNames;
                static $skinsInitialised = false;
-               if ( !$skinsInitialised ) {
+
+               if ( !$skinsInitialised || !count( $wgValidSkinNames ) ) {
                        # Get a list of available skins
                        # Build using the regular expression '^(.*).php$'
                        # Array keys are all lower case, array value keep the case used by filename
                        #
                        wfProfileIn( __METHOD__ . '-init' );
+
                        global $wgStyleDirectory;
+
                        $skinDir = dir( $wgStyleDirectory );
 
                        # while code from www.php.net
-                       while( false !== ( $file = $skinDir->read() ) ) {
+                       while ( false !== ( $file = $skinDir->read() ) ) {
                                // Skip non-PHP files, hidden files, and '.dep' includes
                                $matches = array();
-                               if( preg_match( '/^([^.]*)\.php$/', $file, $matches ) ) {
+
+                               if ( preg_match( '/^([^.]*)\.php$/', $file, $matches ) ) {
                                        $aSkin = $matches[1];
                                        $wgValidSkinNames[strtolower( $aSkin )] = $aSkin;
                                }
@@ -73,10 +80,13 @@ class Skin extends Linker {
         */
        public static function getUsableSkins() {
                global $wgSkipSkins;
+
                $usableSkins = self::getSkinNames();
+
                foreach ( $wgSkipSkins as $skip ) {
                        unset( $usableSkins[$skip] );
                }
+
                return $usableSkins;
        }
 
@@ -89,15 +99,16 @@ class Skin extends Linker {
         */
        static function normalizeKey( $key ) {
                global $wgDefaultSkin;
+
                $skinNames = Skin::getSkinNames();
 
-               if( $key == '' ) {
+               if ( $key == '' ) {
                        // Don't return the default immediately;
                        // in a misconfiguration we need to fall back.
                        $key = $wgDefaultSkin;
                }
 
-               if( isset( $skinNames[$key] ) ) {
+               if ( isset( $skinNames[$key] ) ) {
                        return $key;
                }
 
@@ -109,13 +120,13 @@ class Skin extends Linker {
                        2 => 'cologneblue'
                );
 
-               if( isset( $fallback[$key] ) ) {
+               if ( isset( $fallback[$key] ) ) {
                        $key = $fallback[$key];
                }
 
-               if( isset( $skinNames[$key] ) ) {
+               if ( isset( $skinNames[$key] ) ) {
                        return $key;
-               } else if( isset( $skinNames[$wgDefaultSkin] ) ) {
+               } else if ( isset( $skinNames[$wgDefaultSkin] ) ) {
                        return $wgDefaultSkin;
                } else {
                        return 'vector';
@@ -134,19 +145,20 @@ class Skin extends Linker {
 
                $skinNames = Skin::getSkinNames();
                $skinName = $skinNames[$key];
-               $className = 'Skin' . ucfirst( $key );
+               $className = "Skin{$skinName}";
 
                # Grab the skin class and initialise it.
                if ( !class_exists( $className ) ) {
                        // Preload base classes to work around APC/PHP5 bug
                        $deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
-                       if( file_exists( $deps ) ) {
+
+                       if ( file_exists( $deps ) ) {
                                include_once( $deps );
                        }
                        require_once( "{$wgStyleDirectory}/{$skinName}.php" );
 
                        # Check if we got if not failback to default skin
-                       if( !class_exists( $className ) ) {
+                       if ( !class_exists( $className ) ) {
                                # DO NOT die if the class isn't found. This breaks maintenance
                                # scripts and can cause a user account to be unrecoverable
                                # except by SQL manipulation if a previously valid skin name
@@ -170,18 +182,8 @@ class Skin extends Linker {
                return $this->skinname;
        }
 
-       function qbSetting() {
-               global $wgOut, $wgUser;
-
-               if ( $wgOut->isQuickbarSuppressed() ) {
-                       return 0;
-               }
-               $q = $wgUser->getOption( 'quickbar', 0 );
-               return $q;
-       }
-
        function initPage( OutputPage $out ) {
-               global $wgFavicon, $wgAppleTouchIcon;
+               global $wgFavicon, $wgAppleTouchIcon, $wgEnableAPI;
 
                wfProfileIn( __METHOD__ );
 
@@ -189,11 +191,11 @@ class Skin extends Linker {
                # 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 ) {
                        $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
                }
 
-               if( false !== $wgFavicon ) {
+               if ( false !== $wgFavicon ) {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }
 
@@ -203,7 +205,19 @@ class Skin extends Linker {
                        'type' => 'application/opensearchdescription+xml',
                        'href' => wfScript( 'opensearch_desc' ),
                        'title' => wfMsgForContent( 'opensearch-desc' ),
-               ));
+               ) );
+
+               if ( $wgEnableAPI ) {
+                       # Real Simple Discovery link, provides auto-discovery information
+                       # for the MediaWiki API (and potentially additional custom API
+                       # support such as WordPress or Twitter-compatible APIs for a
+                       # blogging extension, etc)
+                       $out->addLink( array(
+                               'rel' => 'EditURI',
+                               'type' => 'application/rsd+xml',
+                               'href' => wfExpandUrl( wfAppendQuery( wfScript( 'api' ), array( 'action' => 'rsd' ) ) ),
+                       ) );
+               }
 
                $this->addMetadataLinks( $out );
 
@@ -233,28 +247,41 @@ class Skin extends Linker {
                }
 
                $lb = new LinkBatch( $titles );
+               $lb->setCaller( __METHOD__ );
                $lb->execute();
        }
 
        /**
-        * Adds metadata links (Creative Commons/Dublin Core/copyright) to the HTML
-        * output.
+        * Adds metadata links below to the HTML output.
+        * <ol>
+        *  <li>Creative Commons
+        *   <br />See http://wiki.creativecommons.org/Extend_Metadata.
+        *  </li>
+        *  <li>Dublin Core</li>
+        *  <li>Use hreflang to specify canonical and alternate links
+        *   <br />See http://www.google.com/support/webmasters/bin/answer.py?answer=189077
+        *  </li>
+        *  <li>Copyright</li>
+        * <ol>
+        * 
         * @param $out Object: instance of OutputPage
         */
        function addMetadataLinks( OutputPage $out ) {
                global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
+               global $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang;
                global $wgRightsPage, $wgRightsUrl;
 
-               if( $out->isArticleRelated() ) {
+               if ( $out->isArticleRelated() ) {
                        # note: buggy CC software only reads first "meta" link
-                       if( $wgEnableCreativeCommonsRdf ) {
+                       if ( $wgEnableCreativeCommonsRdf ) {
                                $out->addMetadataLink( array(
                                        'title' => 'Creative Commons',
                                        'type' => 'application/rdf+xml',
                                        'href' => $this->mTitle->getLocalURL( 'action=creativecommons' ) )
                                );
                        }
-                       if( $wgEnableDublinCoreRdf ) {
+
+                       if ( $wgEnableDublinCoreRdf ) {
                                $out->addMetadataLink( array(
                                        'title' => 'Dublin Core',
                                        'type' => 'application/rdf+xml',
@@ -262,17 +289,43 @@ class Skin extends Linker {
                                );
                        }
                }
+
+               if ( !$wgDisableLangConversion && $wgCanonicalLanguageLinks
+                       && $wgContLang->hasVariants() ) {
+
+                       $urlvar = $wgContLang->getURLVariant();
+
+                       if ( !$urlvar ) {
+                               $variants = $wgContLang->getVariants();
+                               foreach ( $variants as $_v ) {
+                                       $out->addLink( array(
+                                               'rel' => 'alternate',
+                                               'hreflang' => $_v,
+                                               'href' => $this->mTitle->getLocalURL( '', $_v ) )
+                                       );
+                               }
+                       } else {
+                               $out->addLink( array(
+                                       'rel' => 'canonical',
+                                       'href' => $this->mTitle->getFullURL() )
+                               );
+                       }
+               }
+               
                $copyright = '';
-               if( $wgRightsPage ) {
+               if ( $wgRightsPage ) {
                        $copy = Title::newFromText( $wgRightsPage );
-                       if( $copy ) {
+
+                       if ( $copy ) {
                                $copyright = $copy->getLocalURL();
                        }
                }
-               if( !$copyright && $wgRightsUrl ) {
+
+               if ( !$copyright && $wgRightsUrl ) {
                        $copyright = $wgRightsUrl;
                }
-               if( $copyright ) {
+
+               if ( $copyright ) {
                        $out->addLink( array(
                                'rel' => 'copyright',
                                'href' => $copyright )
@@ -290,6 +343,15 @@ class Skin extends Linker {
                $this->usercss = false;
        }
 
+       /**
+        * Whether the revision displayed is the latest revision of the page
+        *
+        * @return Boolean
+        */
+       public function isRevisionCurrent() {
+               return $this->mRevisionId == 0 || $this->mRevisionId == $this->mTitle->getLatestRevID();
+       }
+
        /**
         * Set the title
         * @param $t Title object to use
@@ -303,9 +365,70 @@ class Skin extends Linker {
                return $this->mTitle;
        }
 
+       /**
+        * Set the "relevant" title
+        * @see self::getRelevantTitle()
+        * @param $t Title object to use
+        */
+       public function setRelevantTitle( $t ) {
+               $this->mRelevantTitle = $t;
+       }
+
+       /**
+        * Return the "relevant" title.
+        * A "relevant" title is not necessarily the actual title of the page.
+        * Special pages like Special:MovePage use set the page they are acting on
+        * as their "relevant" title, this allows the skin system to display things
+        * such as content tabs which belong to to that page instead of displaying
+        * a basic special page tab which has almost no meaning.
+        */
+       public function getRelevantTitle() {
+               if ( isset($this->mRelevantTitle) ) {
+                       return $this->mRelevantTitle;
+               }
+               return $this->mTitle;
+       }
+
+       /**
+        * Set the "relevant" user
+        * @see self::getRelevantUser()
+        * @param $u User object to use
+        */
+       public function setRelevantUser( $u ) {
+               $this->mRelevantUser = $u;
+       }
+
+       /**
+        * Return the "relevant" user.
+        * A "relevant" user is similar to a relevant title. Special pages like
+        * Special:Contributions mark the user which they are relevant to so that
+        * things like the toolbox can display the information they usually are only
+        * able to display on a user's userpage and talkpage.
+        */
+       public function getRelevantUser() {
+               if ( isset($this->mRelevantUser) ) {
+                       return $this->mRelevantUser;
+               }
+               $title = $this->getRelevantTitle();
+               if( $title->getNamespace() == NS_USER || $title->getNamespace() == NS_USER_TALK ) {
+                       $rootUser = strtok( $title->getText(), '/' );
+                       if ( User::isIP( $rootUser ) ) {
+                               $this->mRelevantUser = User::newFromName( $rootUser, false );
+                       } else {
+                               $user = User::newFromName( $rootUser );
+                               if ( $user->isLoggedIn() ) {
+                                       $this->mRelevantUser = $user;
+                               }
+                       }
+                       return $this->mRelevantUser;
+               }
+               return null;
+       }
+
        /**
         * Outputs the HTML generated by other functions.
         * @param $out Object: instance of OutputPage
+        * @todo Exterminate!
         */
        function outputPage( OutputPage $out ) {
                global $wgDebugComments;
@@ -320,7 +443,7 @@ class Skin extends Linker {
                $out->out( $out->headElement( $this ) );
 
                if ( $wgDebugComments ) {
-                       $out->out( "<!-- Wiki debugging output:\n" .
+                       $out->out( "<!-- Debug output:\n" .
                          $out->mDebugtext . "-->\n" );
                }
 
@@ -332,7 +455,7 @@ class Skin extends Linker {
 
                $out->out( $afterContent );
 
-               $out->out( $this->bottomScripts() );
+               $out->out( $this->bottomScripts( $out ) );
 
                $out->out( wfReportTime() );
 
@@ -341,127 +464,13 @@ class Skin extends Linker {
        }
 
        static function makeVariablesScript( $data ) {
-               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" );
+               if ( $data ) {
+                       return Html::inlineScript(
+                               ResourceLoader::makeLoaderConditionalScript( ResourceLoader::makeConfigSetScript( $data ) )
+                       );
                } else {
                        return '';
-               }
-       }
-
-       /**
-        * Make a <script> tag containing global variables
-        * @param $skinName string Name of the skin
-        * The odd calling convention is for backwards compatibility
-        * @todo FIXME: Make this not depend on $wgTitle!
-        */
-       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;
-               global $wgMWSuggestTemplate, $wgDBname, $wgEnableMWSuggest;
-               global $wgSitename;
-
-               $ns = $wgTitle->getNamespace();
-               $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText();
-               $separatorTransTable = $wgContLang->separatorTransformTable();
-               $separatorTransTable = $separatorTransTable ? $separatorTransTable : array();
-               $compactSeparatorTransTable = array(
-                       implode( "\t", array_keys( $separatorTransTable ) ),
-                       implode( "\t", $separatorTransTable ),
-               );
-               $digitTransTable = $wgContLang->digitTransformTable();
-               $digitTransTable = $digitTransTable ? $digitTransTable : array();
-               $compactDigitTransTable = array(
-                       implode( "\t", array_keys( $digitTransTable ) ),
-                       implode( "\t", $digitTransTable ),
-               );
-
-               $mainPage = Title::newMainPage();
-               $vars = array(
-                       'skin' => $skinName,
-                       'stylepath' => $wgStylePath,
-                       'wgUrlProtocols' => wfUrlProtocols(),
-                       'wgArticlePath' => $wgArticlePath,
-                       'wgScriptPath' => $wgScriptPath,
-                       'wgScriptExtension' => $wgScriptExtension,
-                       'wgScript' => $wgScript,
-                       'wgVariantArticlePath' => $wgVariantArticlePath,
-                       'wgActionPaths' => (object)$wgActionPaths,
-                       'wgServer' => $wgServer,
-                       'wgCanonicalNamespace' => $nsname,
-                       'wgCanonicalSpecialPageName' => $ns == NS_SPECIAL ?
-                               SpecialPage::resolveAlias( $wgTitle->getDBkey() ) : false, # bug 21115
-                       'wgNamespaceNumber' => $wgTitle->getNamespace(),
-                       'wgPageName' => $wgTitle->getPrefixedDBKey(),
-                       'wgTitle' => $wgTitle->getText(),
-                       'wgAction' => $wgRequest->getText( 'action', 'view' ),
-                       'wgArticleId' => $wgTitle->getArticleId(),
-                       'wgIsArticle' => $wgOut->isArticle(),
-                       'wgUserName' => $wgUser->isAnon() ? null : $wgUser->getName(),
-                       'wgUserGroups' => $wgUser->getEffectiveGroups(),
-                       'wgUserLanguage' => $wgLang->getCode(),
-                       'wgContentLanguage' => $wgContLang->getCode(),
-                       'wgBreakFrames' => $wgBreakFrames,
-                       'wgCurRevisionId' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
-                       'wgVersion' => $wgVersion,
-                       'wgEnableAPI' => $wgEnableAPI,
-                       'wgEnableWriteAPI' => $wgEnableWriteAPI,
-                       'wgSeparatorTransformTable' => $compactSeparatorTransTable,
-                       'wgDigitTransformTable' => $compactDigitTransTable,
-                       'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
-                       'wgFormattedNamespaces' => $wgContLang->getFormattedNamespaces(),
-                       'wgNamespaceIds' => $wgContLang->getNamespaceIds(),
-                       'wgSiteName' => $wgSitename,
-                       'wgCategories' => $wgOut->getCategories(),
-               );
-               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;
-                       $vars['wgFileExtensions'] = $wgFileExtensions;
-               }
-
-               if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
-                       $vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
-                       $vars['wgDBname'] = $wgDBname;
-                       $vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $wgUser );
-                       $vars['wgMWSuggestMessages'] = array( wfMsg( 'search-mwsuggest-enabled' ), wfMsg( 'search-mwsuggest-disabled' ) );
-               }
-
-               foreach( $wgRestrictionTypes as $type ) {
-                       $vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type );
-               }
-
-               if ( $wgOut->isArticleRelated() && $wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
-                       $msgs = (object)array();
-                       foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching',
-                               'tooltip-ca-watch', 'tooltip-ca-unwatch' ) as $msgName ) {
-                               $msgs->{$msgName . 'Msg'} = wfMsg( $msgName );
-                       }
-                       $vars['wgAjaxWatch'] = $msgs;
-               }
-
-               // Allow extensions to add their custom variables to the global JS variables
-               wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
-
-               return self::makeVariablesScript( $vars );
+               } 
        }
 
        /**
@@ -477,18 +486,19 @@ class Skin extends Linker {
        public function userCanPreview( $action ) {
                global $wgRequest, $wgUser;
 
-               if( $action != 'submit' ) {
+               if ( $action != 'submit' ) {
                        return false;
                }
-               if( !$wgRequest->wasPosted() ) {
+               if ( !$wgRequest->wasPosted() ) {
                        return false;
                }
-               if( !$this->mTitle->userCanEditCssSubpage() ) {
+               if ( !$this->mTitle->userCanEditCssSubpage() ) {
                        return false;
                }
-               if( !$this->mTitle->userCanEditJsSubpage() ) {
+               if ( !$this->mTitle->userCanEditJsSubpage() ) {
                        return false;
                }
+
                return $wgUser->matchEditToken(
                        $wgRequest->getVal( 'wpEditToken' ) );
        }
@@ -508,44 +518,20 @@ class Skin extends Linker {
         * @return string
         */
        public function generateUserJs( $skinName = null ) {
-               global $wgStylePath;
-
-               wfProfileIn( __METHOD__ );
-               if( !$skinName ) {
-                       $skinName = $this->getSkinName();
-               }
-
-               $s = "/* generated javascript */\n";
-               $s .= "var skin = '" . Xml::escapeJsString( $skinName ) . "';\n";
-               $s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
-               $s .= "\n\n/* MediaWiki:Common.js */\n";
-               $commonJs = wfMsgExt( 'common.js', 'content' );
-               if ( !wfEmptyMsg( 'common.js', $commonJs ) ) {
-                       $s .= $commonJs;
-               }
-
-               $s .= "\n\n/* MediaWiki:" . ucfirst( $skinName ) . ".js */\n";
-               // avoid inclusion of non defined user JavaScript (with custom skins only)
-               // by checking for default message content
-               $msgKey = ucfirst( $skinName ) . '.js';
-               $userJS = wfMsgExt( $msgKey, 'content' );
-               if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
-                       $s .= $userJS;
-               }
-
-               wfProfileOut( __METHOD__ );
-               return $s;
+               
+               // Stub - see ResourceLoaderSiteModule, CologneBlue, Simple and Standard skins override this
+               
+               return '';
        }
 
        /**
         * Generate user stylesheet for action=raw&gen=css
         */
        public function generateUserStylesheet() {
-               wfProfileIn( __METHOD__ );
-               $s = "/* generated user stylesheet */\n" .
-                       $this->reallyGenerateUserStylesheet();
-               wfProfileOut( __METHOD__ );
-               return $s;
+               
+               // Stub - see ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this
+               
+               return '';
        }
 
        /**
@@ -553,125 +539,61 @@ class Skin extends Linker {
         * Anything in here won't be generated if $wgAllowUserCssPrefs is false.
         */
        protected function reallyGenerateUserStylesheet() {
-               global $wgUser;
-               $s = '';
-               if( ( $undopt = $wgUser->getOption( 'underline' ) ) < 2 ) {
-                       $underline = $undopt ? 'underline' : 'none';
-                       $s .= "a { text-decoration: $underline; }\n";
-               }
-               if( $wgUser->getOption( 'highlightbroken' ) ) {
-                       $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
-               } else {
-                       $s .= <<<CSS
-a.new, #quickbar a.new,
-a.stub, #quickbar a.stub {
-       color: inherit;
-}
-a.new:after, #quickbar a.new:after {
-       content: "?";
-       color: #CC2200;
-}
-a.stub:after, #quickbar a.stub:after {
-       content: "!";
-       color: #772233;
-}
-CSS;
-               }
-               if( $wgUser->getOption( 'justify' ) ) {
-                       $s .= "#article, #bodyContent, #mw_content { text-align: justify; }\n";
-               }
-               if( !$wgUser->getOption( 'showtoc' ) ) {
-                       $s .= "#toc { display: none; }\n";
-               }
-               if( !$wgUser->getOption( 'editsection' ) ) {
-                       $s .= ".editsection { display: none; }\n";
-               }
-               $fontstyle = $wgUser->getOption( 'editfont' );
-               if ( $fontstyle !== 'default' ) {
-                       $s .= "textarea { font-family: $fontstyle; }\n";
-               }
-               return $s;
+               
+               // Stub - see  ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this
+               
+               return '';
        }
 
        /**
         * @private
         */
        function setupUserCss( OutputPage $out ) {
-               global $wgRequest, $wgContLang, $wgUser;
-               global $wgAllowUserCss, $wgUseSiteCss, $wgSquidMaxage, $wgStylePath;
+               global $wgRequest, $wgUser;
+               global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs;
 
                wfProfileIn( __METHOD__ );
 
                $this->setupSkinUserCss( $out );
-
-               $siteargs = array(
-                       'action' => 'raw',
-                       'maxage' => $wgSquidMaxage,
-               );
-
                // Add any extension CSS
                foreach ( $out->getExtStyle() as $url ) {
                        $out->addStyle( $url );
                }
 
-               // If we use the site's dynamic CSS, throw that in, too
                // Per-site custom styles
-               if( $wgUseSiteCss ) {
-                       global $wgHandheldStyle;
-                       $query = wfArrayToCGI( self::getDynamicStylesheetQuery() );
-                       # Site settings must override extension css! (bug 15025)
-                       $out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) );
-                       $out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ), 'print' );
-                       if( $wgHandheldStyle ) {
-                               $out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI ), 'handheld' );
+               if ( $wgUseSiteCss ) {
+                       $out->addModuleStyles( 'site' );
+                       if( $wgUser->isLoggedIn() ){
+                               $out->addModuleStyles( 'user.groups' );
                        }
-                       $out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
                }
 
-               global $wgAllowUserCssPrefs;
-               if( $wgAllowUserCssPrefs ){
-                       if( $wgUser->isLoggedIn() ) {
-                               // Ensure that logged-in users' generated CSS isn't clobbered
-                               // by anons' publicly cacheable generated CSS.
-                               $siteargs['smaxage'] = '0';
-                               $siteargs['ts'] = $wgUser->mTouched;
-                       }
-                       // Per-user styles based on preferences
-                       $siteargs['gen'] = 'css';
-                       if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) {
-                               $siteargs['useskin'] = $us;
-                       }
-                       $out->addStyle( self::makeUrl( '-', wfArrayToCGI( $siteargs ) ) );
-               }
-
-               // Per-user custom style pages
-               if( $wgAllowUserCss && $wgUser->isLoggedIn() ) {
-                       $action = $wgRequest->getVal( 'action' );
-                       # If we're previewing the CSS page, use it
-                       if( $this->mTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
+               // Per-user custom styles
+               if ( $wgAllowUserCss ) {
+                       if ( $this->mTitle->isCssSubpage() && $this->userCanPreview( $wgRequest->getVal( 'action' ) ) ) {
                                // @FIXME: properly escape the cdata!
                                $out->addInlineStyle( $wgRequest->getText( 'wpTextbox1' ) );
                        } else {
-                               $names = array( 'common', $this->getSkinName() );
-                               foreach( $names as $name ) {
-                                       $out->addStyle( self::makeUrl(
-                                               $this->userpage . '/' . $name . '.css',
-                                               'action=raw&ctype=text/css' )
-                                       );
-                               }
+                               $out->addModuleStyles( 'user' );
                        }
                }
 
+               // Per-user preference styles
+               if ( $wgAllowUserCssPrefs ) {
+                       $out->addModuleStyles( 'user.options' );
+               }
+
                wfProfileOut( __METHOD__ );
        }
-       
+
        /**
         * Get the query to generate a dynamic stylesheet
-        * 
+        *
         * @return array
         */
        public static function getDynamicStylesheetQuery() {
                global $wgSquidMaxage;
+
                return array(
                                'action' => 'raw',
                                'maxage' => $wgSquidMaxage,
@@ -684,112 +606,55 @@ CSS;
        /**
         * Add skin specific stylesheets
         * @param $out OutputPage
+        * @delete
         */
-       function setupSkinUserCss( OutputPage $out ) {
-               $out->addStyle( 'common/shared.css' );
-               $out->addStyle( 'common/oldshared.css' );
-               $out->addStyle( $this->getStylesheet() );
-               $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
-       }
+       abstract function setupSkinUserCss( OutputPage $out );
 
        function getPageClasses( $title ) {
                $numeric = 'ns-' . $title->getNamespace();
-               if( $title->getNamespace() == NS_SPECIAL ) {
+
+               if ( $title->getNamespace() == NS_SPECIAL ) {
                        $type = 'ns-special';
-               } elseif( $title->isTalkPage() ) {
+                       // bug 23315: provide a class based on the canonical special page name without subpages
+                       list( $canonicalName ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
+                       if ( $canonicalName ) {
+                               $type .= ' ' . Sanitizer::escapeClass( "mw-special-$canonicalName" );
+                       } else {
+                               $type .= ' mw-invalidspecialpage';
+                       }
+               } elseif ( $title->isTalkPage() ) {
                        $type = 'ns-talk';
                } else {
                        $type = 'ns-subject';
                }
+
                $name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() );
+
                return "$numeric $type $name";
        }
 
        /**
-        * URL to the logo
+        * This will be called by OutputPage::headElement when it is creating the
+        * <body> tag, skins can override it if they have a need to add in any
+        * body attributes or classes of their own.
         */
-       function getLogo() {
-               global $wgLogo;
-               return $wgLogo;
+       function addToBodyAttributes( $out, &$bodyAttrs ) {
+               // does nothing by default
        }
 
        /**
-        * This will be called immediately after the <body> tag.  Split into
-        * two functions to make it easier to subclass.
+        * URL to the logo
         */
-       function beforeContent() {
-               return $this->doBeforeContent();
-       }
-
-       function doBeforeContent() {
-               global $wgContLang;
-               wfProfileIn( __METHOD__ );
-
-               $s = '';
-               $qb = $this->qbSetting();
-
-               $langlinks = $this->otherLanguages();
-               if( $langlinks ) {
-                       $rows = 2;
-                       $borderhack = '';
-               } else {
-                       $rows = 1;
-                       $langlinks = false;
-                       $borderhack = 'class="top"';
-               }
-
-               $s .= "\n<div id='content'>\n<div id='topbar'>\n" .
-                 "<table border='0' cellspacing='0' width='98%'>\n<tr>\n";
-
-               $shove = ( $qb != 0 );
-               $left = ( $qb == 1 || $qb == 3 );
-               if( $wgContLang->isRTL() ) {
-                       $left = !$left;
-               }
-
-               if( !$shove ) {
-                       $s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
-                               $this->logoText() . '</td>';
-               } elseif( $left ) {
-                       $s .= $this->getQuickbarCompensator( $rows );
-               }
-               $l = $wgContLang->alignStart();
-               $s .= "<td {$borderhack} align='$l' valign='top'>\n";
-
-               $s .= $this->topLinks();
-               $s .= '<p class="subtitle">' . $this->pageTitleLinks() . "</p>\n";
-
-               $r = $wgContLang->alignEnd();
-               $s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
-               $s .= $this->nameAndLogin();
-               $s .= "\n<br />" . $this->searchForm() . '</td>';
-
-               if ( $langlinks ) {
-                       $s .= "</tr>\n<tr>\n<td class='top' colspan=\"2\">$langlinks</td>\n";
-               }
-
-               if ( $shove && !$left ) { # Right
-                       $s .= $this->getQuickbarCompensator( $rows );
-               }
-               $s .= "</tr>\n</table>\n</div>\n";
-               $s .= "\n<div id='article'>\n";
-
-               $notice = wfGetSiteNotice();
-               if( $notice ) {
-                       $s .= "\n<div id='siteNotice'>$notice</div>\n";
-               }
-               $s .= $this->pageTitle();
-               $s .= $this->pageSubtitle();
-               $s .= $this->getCategories();
-               wfProfileOut( __METHOD__ );
-               return $s;
+       function getLogo() {
+               global $wgLogo;
+               return $wgLogo;
        }
 
        function getCategoryLinks() {
                global $wgOut, $wgUseCategoryBrowser;
                global $wgContLang, $wgUser;
 
-               if( count( $wgOut->mCategoryLinks ) == 0 ) {
+               if ( count( $wgOut->mCategoryLinks ) == 0 ) {
                        return '';
                }
 
@@ -805,6 +670,7 @@ CSS;
                $allCats = $wgOut->getCategoryLinks();
                $s = '';
                $colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
+
                if ( !empty( $allCats['normal'] ) ) {
                        $t = $embed . implode( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
 
@@ -817,12 +683,13 @@ CSS;
                # Hidden categories
                if ( isset( $allCats['hidden'] ) ) {
                        if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
-                               $class ='mw-hidden-cats-user-shown';
+                               $class = 'mw-hidden-cats-user-shown';
                        } elseif ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
                                $class = 'mw-hidden-cats-ns-shown';
                        } else {
                                $class = 'mw-hidden-cats-hidden';
                        }
+
                        $s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" .
                                wfMsgExt( 'hidden-categories', array( 'parsemag', 'escapenoentities' ), count( $allCats['hidden'] ) ) .
                                $colon . $embed . implode( "$pop $sep $embed", $allCats['hidden'] ) . $pop .
@@ -831,14 +698,14 @@ CSS;
 
                # optional 'dmoz-like' category browser. Will be shown under the list
                # of categories an article belong to
-               if( $wgUseCategoryBrowser ) {
+               if ( $wgUseCategoryBrowser ) {
                        $s .= '<br /><hr />';
 
                        # get a big array of the parents tree
                        $parenttree = $this->mTitle->getParentCategoryTree();
                        # Skin object passed by reference cause it can not be
                        # accessed under the method subfunction drawCategoryBrowser
-                       $tempout = explode( "\n", Skin::drawCategoryBrowser( $parenttree, $this ) );
+                       $tempout = explode( "\n", $this->drawCategoryBrowser( $parenttree, $this ) );
                        # Clean out bogus first entry and sort them
                        unset( $tempout[0] );
                        asort( $tempout );
@@ -857,18 +724,21 @@ CSS;
         */
        function drawCategoryBrowser( $tree, &$skin ) {
                $return = '';
-               foreach( $tree as $element => $parent ) {
-                       if( empty( $parent ) ) {
+
+               foreach ( $tree as $element => $parent ) {
+                       if ( empty( $parent ) ) {
                                # element start a new list
                                $return .= "\n";
                        } else {
                                # grab the others elements
-                               $return .= Skin::drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
+                               $return .= $this->drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
                        }
+
                        # add our current element to the list
                        $eltitle = Title::newFromText( $element );
                        $return .=  $skin->link( $eltitle, $eltitle->getText() );
                }
+
                return $return;
        }
 
@@ -877,23 +747,20 @@ CSS;
 
                $classes = 'catlinks';
 
-               // Check what we're showing
                global $wgOut, $wgUser;
+
+               // Check what we're showing
                $allCats = $wgOut->getCategoryLinks();
                $showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
                                                $this->mTitle->getNamespace() == NS_CATEGORY;
 
-               if( empty( $allCats['normal'] ) && !( !empty( $allCats['hidden'] ) && $showHidden ) ) {
+               if ( empty( $allCats['normal'] ) && !( !empty( $allCats['hidden'] ) && $showHidden ) ) {
                        $classes .= ' catlinks-allhidden';
                }
 
                return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
        }
 
-       function getQuickbarCompensator( $rows = 1 ) {
-               return "<td width='152' rowspan='{$rows}'>&#160;</td>";
-       }
-
        /**
         * This runs a hook to allow extensions placing their stuff after content
         * and article metadata (e.g. categories).
@@ -911,10 +778,10 @@ CSS;
        protected function afterContentHook() {
                $data = '';
 
-               if( wfRunHooks( 'SkinAfterContent', array( &$data ) ) ) {
+               if ( wfRunHooks( 'SkinAfterContent', array( &$data, $this ) ) ) {
                        // adding just some spaces shouldn't toggle the output
                        // of the whole <div/>, so we use trim() here
-                       if( trim( $data ) != '' ) {
+                       if ( trim( $data ) != '' ) {
                                // Doing this here instead of in the skins to
                                // ensure that the div has the same ID in all
                                // skins
@@ -936,11 +803,13 @@ CSS;
         */
        protected function generateDebugHTML() {
                global $wgShowDebug, $wgOut;
+
                if ( $wgShowDebug ) {
                        $listInternals = $this->formatDebugHTML( $wgOut->mDebugtext );
                        return "\n<hr />\n<strong>Debug data:</strong><ul style=\"font-family:monospace;\" id=\"mw-debug-html\">" .
                                $listInternals . "</ul>\n";
                }
+
                return '';
        }
 
@@ -948,8 +817,8 @@ CSS;
                $lines = explode( "\n", $debugText );
                $curIdent = 0;
                $ret = '<li>';
-               foreach( $lines as $line ) {
-                       $m = array();
+
+               foreach ( $lines as $line ) {
                        $display = ltrim( $line );
                        $ident = strlen( $line ) - strlen( $display );
                        $diff = $ident - $curIdent;
@@ -977,26 +846,21 @@ CSS;
 
                        $curIdent = $ident;
                }
+
                $ret .= str_repeat( '</li></ul>', $curIdent ) . '</li>';
-               return $ret;
-       }
 
-       /**
-        * This gets called shortly before the </body> tag.
-        * @return String HTML to be put before </body>
-        */
-       function afterContent() {
-               $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
-               return $printfooter . $this->generateDebugHTML() . $this->doAfterContent();
+               return $ret;
        }
 
        /**
         * This gets called shortly before the </body> tag.
+        * @param $out OutputPage object
         * @return String HTML-wrapped JS code to be put before </body>
         */
-       function bottomScripts() {
-               $bottomScriptText = "\n" . Html::inlineScript( 'if (window.runOnloadHook) runOnloadHook();' ) . "\n";
+       function bottomScripts( $out ) {
+               $bottomScriptText = "\n" . $out->getHeadScripts( $this );
                wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
+
                return $bottomScriptText;
        }
 
@@ -1006,101 +870,22 @@ CSS;
                return wfMsg( 'retrievedfrom', '<a href="' . $url . '">' . $url . '</a>' );
        }
 
-       function printFooter() {
-               return "<p>" .  $this->printSource() .
-                       "</p>\n\n<p>" . $this->pageStats() . "</p>\n";
-       }
-
-       /** overloaded by derived classes */
-       function doAfterContent() {
-               return '</div></div>';
-       }
-
-       function pageTitleLinks() {
-               global $wgOut, $wgUser, $wgRequest, $wgLang;
-
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
-               $action = $wgRequest->getText( 'action' );
-
-               $s[] = $this->printableLink();
-               $disclaimer = $this->disclaimerLink(); # may be empty
-               if( $disclaimer ) {
-                       $s[] = $disclaimer;
-               }
-               $privacy = $this->privacyLink(); # may be empty too
-               if( $privacy ) {
-                       $s[] = $privacy;
-               }
-
-               if ( $wgOut->isArticleRelated() ) {
-                       if ( $this->mTitle->getNamespace() == NS_FILE ) {
-                               $name = $this->mTitle->getDBkey();
-                               $image = wfFindFile( $this->mTitle );
-                               if( $image ) {
-                                       $link = htmlspecialchars( $image->getURL() );
-                                       $style = $this->getInternalLinkAttributes( $link, $name );
-                                       $s[] = "<a href=\"{$link}\"{$style}>{$name}</a>";
-                               }
-                       }
-               }
-               if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-                       $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->link(
-                                       $wgUser->getTalkPage(),
-                                       wfMsgHtml( 'newmessageslink' ),
-                                       array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
-                               );
-
-                               $dl = $this->link(
-                                       $wgUser->getTalkPage(),
-                                       wfMsgHtml( 'newmessagesdifflink' ),
-                                       array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
-                               );
-                               $s[] = '<strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
-                               # disable caching
-                               $wgOut->setSquidMaxage( 0 );
-                               $wgOut->enableClientCache( false );
-                       }
-               }
-
-               $undelete = $this->getUndeleteLink();
-               if( !empty( $undelete ) ) {
-                       $s[] = $undelete;
-               }
-               return $wgLang->pipeList( $s );
-       }
-
        function getUndeleteLink() {
-               global $wgUser, $wgContLang, $wgLang, $wgRequest;
+               global $wgUser, $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(
@@ -1113,73 +898,34 @@ CSS;
                                );
                        }
                }
+
                return '';
        }
 
-       function printableLink() {
-               global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
-
-               $s = array();
-
-               if ( !$wgOut->isPrintable() ) {
-                       $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
-                       $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
-               }
+       function subPageSubtitle() {
+               $subpages = '';
 
-               if( $wgOut->isSyndicated() ) {
-                       foreach( $wgFeedClasses as $format => $class ) {
-                               $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
-                               $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
-                                               . " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>";
-                       }
+               if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this ) ) ) {
+                       return $subpages;
                }
-               return $wgLang->pipeList( $s );
-       }
-
-       /**
-        * Gets the h1 element with the page title.
-        * @return string
-        */
-       function pageTitle() {
-               global $wgOut;
-               $s = '<h1 class="pagetitle">' . $wgOut->getPageTitle() . '</h1>';
-               return $s;
-       }
 
-       function pageSubtitle() {
                global $wgOut;
 
-               $sub = $wgOut->getSubtitle();
-               if ( $sub == '' ) {
-                       global $wgExtraSubtitle;
-                       $sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
-               }
-               $subpages = $this->subPageSubtitle();
-               $sub .= !empty( $subpages ) ? "</p><p class='subpages'>$subpages" : '';
-               $s = "<p class='subtitle'>{$sub}</p>\n";
-               return $s;
-       }
-
-       function subPageSubtitle() {
-               $subpages = '';
-               if( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) ) {
-                       return $subpages;
-               }
-
-               global $wgOut;
-               if( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
+               if ( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
                        $ptext = $this->mTitle->getPrefixedText();
-                       if( preg_match( '/\//', $ptext ) ) {
+                       if ( preg_match( '/\//', $ptext ) ) {
                                $links = explode( '/', $ptext );
                                array_pop( $links );
                                $c = 0;
                                $growinglink = '';
                                $display = '';
-                               foreach( $links as $link ) {
+
+                               foreach ( $links as $link ) {
                                        $growinglink .= $link;
                                        $display .= $link;
                                        $linkObj = Title::newFromText( $growinglink );
-                                       if( is_object( $linkObj ) && $linkObj->exists() ) {
+
+                                       if ( is_object( $linkObj ) && $linkObj->exists() ) {
                                                $getlink = $this->link(
                                                        $linkObj,
                                                        htmlspecialchars( $display ),
@@ -1187,12 +933,15 @@ CSS;
                                                        array(),
                                                        array( 'known', 'noclasses' )
                                                );
+
                                                $c++;
-                                               if( $c > 1 ) {
+
+                                               if ( $c > 1 ) {
                                                        $subpages .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
                                                } else  {
                                                        $subpages .= '&lt; ';
                                                }
+
                                                $subpages .= $getlink;
                                                $display = '';
                                        } else {
@@ -1202,6 +951,7 @@ CSS;
                                }
                        }
                }
+
                return $subpages;
        }
 
@@ -1213,64 +963,6 @@ CSS;
                return $wgShowIPinHeader && session_id() != '';
        }
 
-       function nameAndLogin() {
-               global $wgUser, $wgLang, $wgContLang;
-
-               $logoutPage = $wgContLang->specialPage( 'Userlogout' );
-
-               $ret = '';
-               if ( $wgUser->isAnon() ) {
-                       if( $this->showIPinHeader() ) {
-                               $name = wfGetIP();
-
-                               $talkLink = $this->link( $wgUser->getTalkPage(),
-                                       $wgLang->getNsText( NS_TALK ) );
-
-                               $ret .= "$name ($talkLink)";
-                       } else {
-                               $ret .= wfMsg( 'notloggedin' );
-                       }
-
-                       $returnTo = $this->mTitle->getPrefixedDBkey();
-                       $query = array();
-                       if ( $logoutPage != $returnTo ) {
-                               $query['returnto'] = $returnTo;
-                       }
-
-                       $loginlink = $wgUser->isAllowed( 'createaccount' )
-                               ? 'nav-login-createaccount'
-                               : 'login';
-                       $ret .= "\n<br />" . $this->link(
-                               SpecialPage::getTitleFor( 'Userlogin' ),
-                               wfMsg( $loginlink ), array(), $query
-                       );
-               } else {
-                       $returnTo = $this->mTitle->getPrefixedDBkey();
-                       $talkLink = $this->link( $wgUser->getTalkPage(),
-                               $wgLang->getNsText( NS_TALK ) );
-
-                       $ret .= $this->link( $wgUser->getUserPage(),
-                               htmlspecialchars( $wgUser->getName() ) );
-                       $ret .= " ($talkLink)<br />";
-                       $ret .= $wgLang->pipeList( array(
-                               $this->link(
-                                       SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
-                                       array(), array( 'returnto' => $returnTo )
-                               ),
-                               $this->specialLink( 'preferences' ),
-                       ) );
-               }
-               $ret = $wgLang->pipeList( array(
-                       $ret,
-                       $this->link(
-                               Title::newFromText( wfMsgForContent( 'helppage' ) ),
-                               wfMsg( 'help' )
-                       ),
-               ) );
-
-               return $ret;
-       }
-
        function getSearchLink() {
                $searchPage = SpecialPage::getTitleFor( 'Search' );
                return $searchPage->getLocalURL();
@@ -1280,226 +972,13 @@ CSS;
                return htmlspecialchars( $this->getSearchLink() );
        }
 
-       function searchForm() {
-               global $wgRequest, $wgUseTwoButtonsSearchForm;
-               $search = $wgRequest->getText( 'search' );
-
-               $s = '<form id="searchform' . $this->searchboxes . '" name="search" class="inline" method="post" action="'
-                 . $this->escapeSearchLink() . "\">\n"
-                 . '<input type="text" id="searchInput' . $this->searchboxes . '" name="search" size="19" value="'
-                 . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />\n"
-                 . '<input type="submit" name="go" value="' . wfMsg( 'searcharticle' ) . '" />';
-
-               if( $wgUseTwoButtonsSearchForm ) {
-                       $s .= '&#160;<input type="submit" name="fulltext" value="' . wfMsg( 'searchbutton' ) . "\" />\n";
-               } else {
-                       $s .= ' <a href="' . $this->escapeSearchLink() . '" rel="search">' . wfMsg( 'powersearch-legend' ) . "</a>\n";
-               }
-
-               $s .= '</form>';
-
-               // Ensure unique id's for search boxes made after the first
-               $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;
-
-               return $s;
-       }
-
-       function topLinks() {
-               global $wgOut;
-
-               $s = array(
-                       $this->mainPageLink(),
-                       $this->specialLink( 'recentchanges' )
-               );
-
-               if ( $wgOut->isArticleRelated() ) {
-                       $s[] = $this->editThisPage();
-                       $s[] = $this->historyLink();
-               }
-               # Many people don't like this dropdown box
-               #$s[] = $this->specialPagesList();
-
-               if( $this->variantLinks() ) {
-                       $s[] = $this->variantLinks();
-               }
-
-               if( $this->extensionTabLinks() ) {
-                       $s[] = $this->extensionTabLinks();
-               }
-
-               // FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline
-               return implode( $s, wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n" );
-       }
-
-       /**
-        * Compatibility for extensions adding functionality through tabs.
-        * Eventually these old skins should be replaced with SkinTemplate-based
-        * versions, sigh...
-        * @return string
-        */
-       function extensionTabLinks() {
-               $tabs = array();
-               $out = '';
-               $s = array();
-               wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
-               foreach( $tabs as $tab ) {
-                       $s[] = Xml::element( 'a',
-                               array( 'href' => $tab['href'] ),
-                               $tab['text'] );
-               }
-
-               if( count( $s ) ) {
-                       global $wgLang;
-
-                       $out = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
-                       $out .= $wgLang->pipeList( $s );
-               }
-
-               return $out;
-       }
-
-       /**
-        * Language/charset variant links for classic-style skins
-        * @return string
-        */
-       function variantLinks() {
-               $s = '';
-               /* show links to different language variants */
-               global $wgDisableLangConversion, $wgLang, $wgContLang;
-               $variants = $wgContLang->getVariants();
-               if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
-                       foreach( $variants as $code ) {
-                               $varname = $wgContLang->getVariantname( $code );
-                               if( $varname == 'disable' ) {
-                                       continue;
-                               }
-                               $s = $wgLang->pipeList( array(
-                                       $s,
-                                       '<a href="' . $this->mTitle->escapeLocalURL( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
-                               ) );
-                       }
-               }
-               return $s;
-       }
-
-       function bottomLinks() {
-               global $wgOut, $wgUser, $wgUseTrackbacks;
-               $sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n";
-
-               $s = '';
-               if ( $wgOut->isArticleRelated() ) {
-                       $element[] = '<strong>' . $this->editThisPage() . '</strong>';
-                       if ( $wgUser->isLoggedIn() ) {
-                               $element[] = $this->watchThisPage();
-                       }
-                       $element[] = $this->talkLink();
-                       $element[] = $this->historyLink();
-                       $element[] = $this->whatLinksHere();
-                       $element[] = $this->watchPageLinksLink();
-
-                       if( $wgUseTrackbacks ) {
-                               $element[] = $this->trackbackLink();
-                       }
-
-                       if (
-                               $this->mTitle->getNamespace() == NS_USER ||
-                               $this->mTitle->getNamespace() == NS_USER_TALK
-                       )
-                       {
-                               $id = User::idFromName( $this->mTitle->getText() );
-                               $ip = User::isIP( $this->mTitle->getText() );
-
-                               # Both anons and non-anons have contributions list
-                               if( $id || $ip ) {
-                                       $element[] = $this->userContribsLink();
-                               }
-                               if( $this->showEmailUser( $id ) ) {
-                                       $element[] = $this->emailUserLink();
-                               }
-                       }
-
-                       $s = implode( $element, $sep );
-
-                       if ( $this->mTitle->getArticleId() ) {
-                               $s .= "\n<br />";
-                               // Delete/protect/move links for privileged users
-                               if( $wgUser->isAllowed( 'delete' ) ) {
-                                       $s .= $this->deleteThisPage();
-                               }
-                               if( $wgUser->isAllowed( 'protect' ) ) {
-                                       $s .= $sep . $this->protectThisPage();
-                               }
-                               if( $wgUser->isAllowed( 'move' ) ) {
-                                       $s .= $sep . $this->moveThisPage();
-                               }
-                       }
-                       $s .= "<br />\n" . $this->otherLanguages();
-               }
-
-               return $s;
-       }
-
-       function pageStats() {
-               global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
-               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgPageShowWatchingUsers;
-
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
-               if ( !$wgOut->isArticle() ) {
-                       return '';
-               }
-               if( !$wgArticle instanceof Article ) {
-                       return '';
-               }
-               if ( isset( $oldid ) || isset( $diff ) ) {
-                       return '';
-               }
-               if ( 0 == $wgArticle->getID() ) {
-                       return '';
-               }
-
-               $s = '';
-               if ( !$wgDisableCounters ) {
-                       $count = $wgLang->formatNum( $wgArticle->getCount() );
-                       if ( $count ) {
-                               $s = wfMsgExt( 'viewcount', array( 'parseinline' ), $count );
-                       }
-               }
-
-               if( $wgMaxCredits != 0 ) {
-                       $s .= ' ' . Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
-               } else {
-                       $s .= $this->lastModified();
-               }
-
-               if( $wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ) ) {
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $res = $dbr->select(
-                               'watchlist',
-                               array( 'COUNT(*) AS n' ),
-                               array(
-                                       'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ),
-                                       'wl_namespace' => $this->mTitle->getNamespace()
-                               ),
-                               __METHOD__
-                       );
-                       $x = $dbr->fetchObject( $res );
-
-                       $s .= ' ' . wfMsgExt( 'number_of_watching_users_pageview',
-                               array( 'parseinline' ), $wgLang->formatNum( $x->n )
-                       );
-               }
-
-               return $s . ' ' .  $this->getCopyright();
-       }
-
        function getCopyright( $type = 'detect' ) {
-               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest, $wgArticle;
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
 
                if ( $type == 'detect' ) {
                        $diff = $wgRequest->getVal( 'diff' );
-                       $isCur = $wgArticle && $wgArticle->isCurrent();
-                       if ( is_null( $diff ) && !$isCur && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+
+                       if ( is_null( $diff ) && !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
                                $type = 'history';
                        } else {
                                $type = 'normal';
@@ -1513,48 +992,56 @@ CSS;
                }
 
                $out = '';
-               if( $wgRightsPage ) {
+
+               if ( $wgRightsPage ) {
                        $title = Title::newFromText( $wgRightsPage );
                        $link = $this->linkKnown( $title, $wgRightsText );
-               } elseif( $wgRightsUrl ) {
+               } elseif ( $wgRightsUrl ) {
                        $link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
-               } elseif( $wgRightsText ) {
+               } elseif ( $wgRightsText ) {
                        $link = $wgRightsText;
                } else {
                        # Give up now
                        return $out;
                }
+
                // Allow for site and per-namespace customization of copyright notice.
                $forContent = true;
-               if( isset( $wgArticle ) ) {
-                       wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link, &$forContent ) );
-               }
+
+               wfRunHooks( 'SkinCopyrightFooter', array( $this->mTitle, $type, &$msg, &$link, &$forContent ) );
 
                if ( $forContent ) {
                        $out .= wfMsgForContent( $msg, $link );
                } else {
                        $out .= wfMsg( $msg, $link );
                }
+
                return $out;
        }
 
        function getCopyrightIcon() {
                global $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
+
                $out = '';
+
                if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
                        $out = $wgCopyrightIcon;
                } elseif ( $wgRightsIcon ) {
                        $icon = htmlspecialchars( $wgRightsIcon );
+
                        if ( $wgRightsUrl ) {
                                $url = htmlspecialchars( $wgRightsUrl );
-                               $out .= '<a href="'.$url.'">';
+                               $out .= '<a href="' . $url . '">';
                        }
+
                        $text = htmlspecialchars( $wgRightsText );
                        $out .= "<img src=\"$icon\" alt=\"$text\" width=\"88\" height=\"31\" />";
+
                        if ( $wgRightsUrl ) {
                                $out .= '</a>';
                        }
                }
+
                return $out;
        }
 
@@ -1564,18 +1051,28 @@ CSS;
         */
        function getPoweredBy() {
                global $wgStylePath;
+
                $url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
-               $img = '<a href="http://www.mediawiki.org/"><img src="' . $url . '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
-               return $img;
+               $text = '<a href="http://www.mediawiki.org/"><img src="' . $url . '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
+               wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );       
+               return $text;
        }
 
-       function lastModified() {
-               global $wgLang, $wgArticle;
-               if( $this->mRevisionId && $this->mRevisionId != $wgArticle->getLatest() ) {
-                       $timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
+       /**
+        * Get the timestamp of the latest revision, formatted in user language
+        *
+        * @param $article Article object. Used if we're working with the current revision
+        * @return String
+        */
+       protected function lastModified( $article ) {
+               global $wgLang;
+
+               if ( !$this->isRevisionCurrent() ) {
+                       $timestamp = Revision::getTimestampFromId( $this->mTitle, $this->mRevisionId );
                } else {
-                       $timestamp = $wgArticle->getTimestamp();
+                       $timestamp = $article->getTimestamp();
                }
+
                if ( $timestamp ) {
                        $d = $wgLang->date( $timestamp, true );
                        $t = $wgLang->time( $timestamp, true );
@@ -1583,9 +1080,11 @@ CSS;
                } else {
                        $s = '';
                }
+
                if ( wfGetLB()->getLaggedSlaveMode() ) {
                        $s .= ' <strong>' . wfMsg( 'laggedslavemode' ) . '</strong>';
                }
+
                return $s;
        }
 
@@ -1602,37 +1101,31 @@ CSS;
 
                $logourl = $this->getLogo();
                $s = "<a href='{$url}'><img{$a} src='{$logourl}' alt='[{$mp}]' /></a>";
+
                return $s;
        }
 
        /**
-        * Show a drop-down box of special pages
+        * Renders a $wgFooterIcons icon acording to the method's arguments
+        * @param $icon Array: The icon to build the html for, see $wgFooterIcons for the format of this array
+        * @param $withImage Boolean: Whether to use the icon's image or output a text-only footericon
         */
-       function specialPagesList() {
-               global $wgUser, $wgContLang, $wgServer, $wgRedirectScript;
-               $pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
-               foreach ( $pages as $name => $page ) {
-                       $pages[$name] = $page->getDescription();
-               }
-
-               $go = wfMsg( 'go' );
-               $sp = wfMsg( 'specialpages' );
-               $spp = $wgContLang->specialPage( 'Specialpages' );
-
-               $s = '<form id="specialpages" method="get" ' .
-                 'action="' . htmlspecialchars( "{$wgServer}{$wgRedirectScript}" ) . "\">\n";
-               $s .= "<select name=\"wpDropdown\">\n";
-               $s .= "<option value=\"{$spp}\">{$sp}</option>\n";
-
-
-               foreach ( $pages as $name => $desc ) {
-                       $p = $wgContLang->specialPage( $name );
-                       $s .= "<option value=\"{$p}\">{$desc}</option>\n";
+       function makeFooterIcon( $icon, $withImage = 'withImage' ) {
+               if ( is_string( $icon ) ) {
+                       $html = $icon;
+               } else { // Assuming array
+                       $url = isset($icon["url"]) ? $icon["url"] : null;
+                       unset( $icon["url"] );
+                       if ( isset( $icon["src"] ) && $withImage === 'withImage' ) {
+                               $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array
+                       } else {
+                               $html = htmlspecialchars( $icon["alt"] );
+                       }
+                       if ( $url ) {
+                               $html = Html::rawElement( 'a', array( "href" => $url ), $html );
+                       }
                }
-               $s .= "</select>\n";
-               $s .= "<input type='submit' value=\"{$go}\" name='redirect' />\n";
-               $s .= "</form>\n";
-               return $s;
+               return $html;
        }
 
        /**
@@ -1647,12 +1140,13 @@ CSS;
                        array(),
                        array( 'known', 'noclasses' )
                );
+
                return $s;
        }
 
-       private function footerLink( $desc, $page ) {
+       public function footerLink( $desc, $page ) {
                // if the link description has been set to "-" in the default language,
-               if ( wfMsgForContent( $desc )  == '-') {
+               if ( wfMsgForContent( $desc )  == '-' ) {
                        // then it is disabled, for all languages.
                        return '';
                } else {
@@ -1660,6 +1154,7 @@ CSS;
                        // 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.
                        $title = Title::newFromText( wfMsgForContent( $page ) );
+
                        return $this->linkKnown(
                                $title,
                                wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) )
@@ -1688,31 +1183,6 @@ CSS;
                return $this->footerLink( 'disclaimers', 'disclaimerpage' );
        }
 
-       function editThisPage() {
-               global $wgOut;
-
-               if ( !$wgOut->isArticleRelated() ) {
-                       $s = wfMsg( 'protectedpage' );
-               } else {
-                       if( $this->mTitle->quickUserCan( 'edit' ) && $this->mTitle->exists() ) {
-                               $t = wfMsg( 'editthispage' );
-                       } elseif( $this->mTitle->quickUserCan( 'create' ) && !$this->mTitle->exists() ) {
-                               $t = wfMsg( 'create-this-page' );
-                       } else {
-                               $t = wfMsg( 'viewsource' );
-                       }
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $t,
-                               array(),
-                               $this->editUrlOptions(),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-               return $s;
-       }
-
        /**
         * Return URL options for the 'edit page' link.
         * This may include an 'oldid' specifier, if the current page view is such.
@@ -1721,135 +1191,15 @@ CSS;
         * @private
         */
        function editUrlOptions() {
-               global $wgArticle;
-
                $options = array( 'action' => 'edit' );
 
-               if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
+               if ( !$this->isRevisionCurrent() ) {
                        $options['oldid'] = intval( $this->mRevisionId );
                }
 
                return $options;
        }
 
-       function deleteThisPage() {
-               global $wgUser, $wgRequest;
-
-               $diff = $wgRequest->getVal( 'diff' );
-               if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
-                       $t = wfMsg( 'deletethispage' );
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $t,
-                               array(),
-                               array( 'action' => 'delete' ),
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $s = '';
-               }
-               return $s;
-       }
-
-       function protectThisPage() {
-               global $wgUser, $wgRequest;
-
-               $diff = $wgRequest->getVal( 'diff' );
-               if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
-                       if ( $this->mTitle->isProtected() ) {
-                               $text = wfMsg( 'unprotectthispage' );
-                               $query = array( 'action' => 'unprotect' );
-                       } else {
-                               $text = wfMsg( 'protectthispage' );
-                               $query = array( 'action' => 'protect' );
-                       }
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $text,
-                               array(),
-                               $query,
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $s = '';
-               }
-               return $s;
-       }
-
-       function watchThisPage() {
-               global $wgOut;
-               ++$this->mWatchLinkNum;
-
-               if ( $wgOut->isArticleRelated() ) {
-                       if ( $this->mTitle->userIsWatching() ) {
-                               $text = wfMsg( 'unwatchthispage' );
-                               $query = array( 'action' => 'unwatch' );
-                               $id = 'mw-unwatch-link' . $this->mWatchLinkNum;
-                       } else {
-                               $text = wfMsg( 'watchthispage' );
-                               $query = array( 'action' => 'watch' );
-                               $id = 'mw-watch-link' . $this->mWatchLinkNum;
-                       }
-
-                       $s = $this->link(
-                               $this->mTitle,
-                               $text,
-                               array( 'id' => $id ),
-                               $query,
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $s = wfMsg( 'notanarticle' );
-               }
-               return $s;
-       }
-
-       function moveThisPage() {
-               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 '';
-               }
-       }
-
-       function historyLink() {
-               return $this->link(
-                       $this->mTitle,
-                       wfMsgHtml( 'history' ),
-                       array( 'rel' => 'archives' ),
-                       array( 'action' => 'history' )
-               );
-       }
-
-       function whatLinksHere() {
-               return $this->link(
-                       SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
-                       wfMsgHtml( 'whatlinkshere' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
-       function userContribsLink() {
-               return $this->link(
-                       SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
-                       wfMsgHtml( 'contributions' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
        function showEmailUser( $id ) {
                global $wgUser;
                $targetUser = User::newFromId( $id );
@@ -1857,178 +1207,35 @@ CSS;
                        $targetUser->canReceiveEmail(); # the target user must have a confirmed email address and allow emails from users
        }
 
-       function emailUserLink() {
-               return $this->link(
-                       SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
-                       wfMsg( 'emailuser' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
-               );
-       }
-
-       function watchPageLinksLink() {
-               global $wgOut;
-               if ( !$wgOut->isArticleRelated() ) {
-                       return '(' . wfMsg( 'notanarticle' ) . ')';
-               } else {
-                       return $this->link(
-                               SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
-                               wfMsg( 'recentchangeslinked-toolbox' ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-       }
-
-       function trackbackLink() {
-               return '<a href="' . $this->mTitle->trackbackURL() . '">'
-                       . wfMsg( 'trackbacklink' ) . '</a>';
-       }
-
-       function otherLanguages() {
-               global $wgOut, $wgContLang, $wgHideInterlanguageLinks;
-
-               if ( $wgHideInterlanguageLinks ) {
-                       return '';
-               }
-
-               $a = $wgOut->getLanguageLinks();
-               if ( 0 == count( $a ) ) {
-                       return '';
-               }
-
-               $s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' );
-               $first = true;
-               if( $wgContLang->isRTL() ) {
-                       $s .= '<span dir="LTR">';
-               }
-               foreach( $a as $l ) {
-                       if ( !$first ) {
-                               $s .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
-                       }
-                       $first = false;
-
-                       $nt = Title::newFromText( $l );
-                       $url = $nt->escapeFullURL();
-                       $text = $wgContLang->getLanguageName( $nt->getInterwiki() );
-                       $title = htmlspecialchars( $nt->getText() );
-
-                       if ( $text == '' ) {
-                               $text = $l;
-                       }
-                       $style = $this->getExternalLinkAttributes();
-                       $s .= "<a href=\"{$url}\" title=\"{$title}\"{$style}>{$text}</a>";
-               }
-               if( $wgContLang->isRTL() ) {
-                       $s .= '</span>';
-               }
-               return $s;
-       }
-
-       function talkLink() {
-               if ( NS_SPECIAL == $this->mTitle->getNamespace() ) {
-                       # No discussion links for special pages
-                       return '';
-               }
-
-               $linkOptions = array();
-
-               if( $this->mTitle->isTalkPage() ) {
-                       $link = $this->mTitle->getSubjectPage();
-                       switch( $link->getNamespace() ) {
-                               case NS_MAIN:
-                                       $text = wfMsg( 'articlepage' );
-                                       break;
-                               case NS_USER:
-                                       $text = wfMsg( 'userpage' );
-                                       break;
-                               case NS_PROJECT:
-                                       $text = wfMsg( 'projectpage' );
-                                       break;
-                               case NS_FILE:
-                                       $text = wfMsg( 'imagepage' );
-                                       # Make link known if image exists, even if the desc. page doesn't.
-                                       if( wfFindFile( $link ) )
-                                               $linkOptions[] = 'known';
-                                       break;
-                               case NS_MEDIAWIKI:
-                                       $text = wfMsg( 'mediawikipage' );
-                                       break;
-                               case NS_TEMPLATE:
-                                       $text = wfMsg( 'templatepage' );
-                                       break;
-                               case NS_HELP:
-                                       $text = wfMsg( 'viewhelppage' );
-                                       break;
-                               case NS_CATEGORY:
-                                       $text = wfMsg( 'categorypage' );
-                                       break;
-                               default:
-                                       $text = wfMsg( 'articlepage' );
-                       }
-               } else {
-                       $link = $this->mTitle->getTalkPage();
-                       $text = wfMsg( 'talkpage' );
-               }
-
-               $s = $this->link( $link, $text, array(), array(), $linkOptions );
-
-               return $s;
-       }
-
-       function commentLink() {
-               global $wgOut;
-
-               if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
-                       return '';
-               }
-
-               # __NEWSECTIONLINK___ changes behaviour here
-               # If it is present, the link points to this page, otherwise
-               # it points to the talk page
-               if( $this->mTitle->isTalkPage() ) {
-                       $title = $this->mTitle;
-               } elseif( $wgOut->showNewSectionLink() ) {
-                       $title = $this->mTitle;
-               } else {
-                       $title = $this->mTitle->getTalkPage();
-               }
-
-               return $this->link(
-                       $title,
-                       wfMsg( 'postcomment' ),
-                       array(),
-                       array(
-                               'action' => 'edit',
-                               'section' => 'new'
-                       ),
-                       array( 'known', 'noclasses' )
-               );
+       /**
+        * Return a fully resolved style path url to images or styles stored in the common folder.
+        * This method returns a url resolved using the configured skin style path
+        * and includes the style version inside of the url.
+        * @param $name String: The name or path of a skin resource file
+        * @return String The fully resolved style path url including styleversion
+        */
+       function getCommonStylePath( $name ) {
+               global $wgStylePath, $wgStyleVersion;
+               return "$wgStylePath/common/$name?$wgStyleVersion";
        }
 
-       function getUploadLink() {
-               global $wgUploadNavigationUrl;
-
-               if( $wgUploadNavigationUrl ) {
-                       # Using an empty class attribute to avoid automatic setting of "external" class
-                       return $this->makeExternalLink( $wgUploadNavigationUrl, wfMsgHtml( 'upload' ), false, null, array( 'class' => '') );
-               } else {
-                       return $this->link(
-                               SpecialPage::getTitleFor('Upload'),
-                               wfMsgHtml( 'upload' ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                       );
-               }
+       /**
+        * Return a fully resolved style path url to images or styles stored in the curent skins's folder.
+        * This method returns a url resolved using the configured skin style path
+        * and includes the style version inside of the url.
+        * @param $name String: The name or path of a skin resource file
+        * @return String The fully resolved style path url including styleversion
+        */
+       function getSkinStylePath( $name ) {
+               global $wgStylePath, $wgStyleVersion;
+               return "$wgStylePath/{$this->stylename}/$name?$wgStyleVersion";
        }
 
        /* these are used extensively in SkinTemplate, but also some other places */
        static function makeMainPageUrl( $urlaction = '' ) {
                $title = Title::newMainPage();
                self::checkTitle( $title, '' );
+
                return $title->getLocalURL( $urlaction );
        }
 
@@ -2051,6 +1258,7 @@ CSS;
        static function makeUrl( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
                self::checkTitle( $title, $name );
+
                return $title->getLocalURL( $urlaction );
        }
 
@@ -2070,6 +1278,7 @@ CSS;
        static function makeNSUrl( $name, $urlaction = '', $namespace = NS_MAIN ) {
                $title = Title::makeTitleSafe( $namespace, $name );
                self::checkTitle( $title, $name );
+
                return $title->getLocalURL( $urlaction );
        }
 
@@ -2077,9 +1286,10 @@ CSS;
        static function makeUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
                self::checkTitle( $title, $name );
+
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 
@@ -2089,6 +1299,7 @@ CSS;
        static function makeKnownUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
                self::checkTitle( $title, $name );
+
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
                        'exists' => true
@@ -2097,9 +1308,9 @@ CSS;
 
        # make sure we have some title to operate on
        static function checkTitle( &$title, $name ) {
-               if( !is_object( $title ) ) {
+               if ( !is_object( $title ) ) {
                        $title = Title::newFromText( $name );
-                       if( !is_object( $title ) ) {
+                       if ( !is_object( $title ) ) {
                                $title = Title::newFromText( '--error: link target missing--' );
                        }
                }
@@ -2132,6 +1343,7 @@ CSS;
                if ( $wgEnableSidebarCache ) {
                        $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
                }
+
                wfProfileOut( __METHOD__ );
                return $bar;
        }
@@ -2140,14 +1352,14 @@ CSS;
         * Currently only used for MediaWiki:Sidebar (but may be used by Extensions)
         *
         * This is just a wrapper around addToSidebarPlain() for backwards compatibility
-        * 
+        *
         * @param &$bar array
         * @param $message String
         */
        function addToSidebar( &$bar, $message ) {
                $this->addToSidebarPlain( $bar, wfMsgForContent( $message ) );
        }
-       
+
        /**
         * Add content from plain text
         * @since 1.17
@@ -2159,29 +1371,35 @@ CSS;
                $wikiBar = array(); # We need to handle the wikitext on a different variable, to avoid trying to do an array operation on text, which would be a fatal error.
 
                $heading = '';
-               foreach( $lines as $line ) {
-                       if( strpos( $line, '*' ) !== 0 ) {
+
+               foreach ( $lines as $line ) {
+                       if ( strpos( $line, '*' ) !== 0 ) {
                                continue;
                        }
-                       if( strpos( $line, '**') !== 0 ) {
+
+                       if ( strpos( $line, '**' ) !== 0 ) {
                                $heading = trim( $line, '* ' );
-                               if( !array_key_exists( $heading, $bar ) ) {
+                               if ( !array_key_exists( $heading, $bar ) ) {
                                        $bar[$heading] = array();
                                }
                        } else {
                                $line = trim( $line, '* ' );
-                               if( strpos( $line, '|' ) !== false ) { // sanity check
+
+                               if ( strpos( $line, '|' ) !== false ) { // sanity check
                                        $line = array_map( 'trim', explode( '|', $line, 2 ) );
                                        $link = wfMsgForContent( $line[0] );
-                                       if( $link == '-' ) {
+
+                                       if ( $link == '-' ) {
                                                continue;
                                        }
 
                                        $text = wfMsgExt( $line[1], 'parsemag' );
-                                       if( wfEmptyMsg( $line[1], $text ) ) {
+
+                                       if ( wfEmptyMsg( $line[1], $text ) ) {
                                                $text = $line[1];
                                        }
-                                       if( wfEmptyMsg( $line[0], $link ) ) {
+
+                                       if ( wfEmptyMsg( $line[0], $link ) ) {
                                                $link = $line[0];
                                        }
 
@@ -2189,6 +1407,7 @@ CSS;
                                                $href = $link;
                                        } else {
                                                $title = Title::newFromText( $link );
+
                                                if ( $title ) {
                                                        $title = $title->fixSpecialName();
                                                        $href = $title->getLocalURL();
@@ -2203,25 +1422,25 @@ CSS;
                                                'id' => 'n-' . strtr( $line[1], ' ', '-' ),
                                                'active' => false
                                        );
-                               } else if ( (substr($line, 0, 2) == '{{') && (substr($line, -2) == '}}') ) {
+                               } else if ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
                                        global $wgParser, $wgTitle;
-                                       
-                                       $line = substr($line, 2, strlen($line) - 4 );
-                                       
-                                       if (is_null($wgParser->mOptions))
-                                               $wgParser->mOptions = new ParserOptions();
-                                       
-                                       $wgParser->mOptions->setEditSection(false);
-                                       $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $wgTitle, $wgParser->mOptions )->getText();
+
+                                       $line = substr( $line, 2, strlen( $line ) - 4 );
+
+                                       $options = new ParserOptions();
+                                       $options->setEditSection( false );
+                                       $options->setInterfaceMessage( true );
+                                       $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $wgTitle, $options )->getText();
                                } else {
                                        continue;
                                }
                        }
                }
-               
-               if ( count($wikiBar) > 0 )
-                       $bar = array_merge($bar, $wikiBar);
-               
+
+               if ( count( $wikiBar ) > 0 ) {
+                       $bar = array_merge( $bar, $wikiBar );
+               }
+
                return $bar;
        }
 
@@ -2243,14 +1462,15 @@ CSS;
         */
        function getNewtalks() {
                global $wgUser, $wgOut;
+
                $newtalks = $wgUser->getNewMessageLinks();
                $ntl = '';
 
-               if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
+               if ( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
                        $userTitle = $this->mUser->getUserPage();
                        $userTalkTitle = $userTitle->getTalkPage();
 
-                       if( !$userTalkTitle->equals( $this->mTitle ) ) {
+                       if ( !$userTalkTitle->equals( $this->mTitle ) ) {
                                $newMessagesLink = $this->link(
                                        $userTalkTitle,
                                        wfMsgHtml( 'newmessageslink' ),
@@ -2275,11 +1495,12 @@ CSS;
                                # Disable Squid cache
                                $wgOut->setSquidMaxage( 0 );
                        }
-               } elseif( count( $newtalks ) ) {
+               } elseif ( count( $newtalks ) ) {
                        // _>" " for BC <= 1.16
                        $sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
                        $msgs = array();
-                       foreach( $newtalks as $newtalk ) {
+
+                       foreach ( $newtalks as $newtalk ) {
                                $msgs[] = Xml::element(
                                        'a',
                                        array( 'href' => $newtalk['link'] ), $newtalk['wiki']
@@ -2289,7 +1510,118 @@ CSS;
                        $ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
                        $wgOut->setSquidMaxage( 0 );
                }
+
                return $ntl;
        }
 
+       /**
+        * Get a cached notice
+        *
+        * @param $name String: message name, or 'default' for $wgSiteNotice
+        * @return String: HTML fragment
+        */
+       private function getCachedNotice( $name ) {
+               global $wgOut, $wgRenderHashAppend, $parserMemc;
+
+               wfProfileIn( __METHOD__ );
+
+               $needParse = false;
+
+               if( $name === 'default' ) {
+                       // special case
+                       global $wgSiteNotice;
+                       $notice = $wgSiteNotice;
+                       if( empty( $notice ) ) {
+                               wfProfileOut( __METHOD__ );
+                               return false;
+                       }
+               } else {
+                       $msg = wfMessage( $name )->inContentLanguage();
+                       if( $msg->isDisabled() ) {
+                               wfProfileOut( __METHOD__ );
+                               return false;
+                       }
+                       $notice = $msg->plain();
+               }
+
+               // Use the extra hash appender to let eg SSL variants separately cache.
+               $key = wfMemcKey( $name . $wgRenderHashAppend );
+               $cachedNotice = $parserMemc->get( $key );
+               if( is_array( $cachedNotice ) ) {
+                       if( md5( $notice ) == $cachedNotice['hash'] ) {
+                               $notice = $cachedNotice['html'];
+                       } else {
+                               $needParse = true;
+                       }
+               } else {
+                       $needParse = true;
+               }
+
+               if ( $needParse ) {
+                       if( is_object( $wgOut ) ) {
+                               $parsed = $wgOut->parse( $notice );
+                               $parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+                               $notice = $parsed;
+                       } else {
+                               wfDebug( 'wfGetCachedNotice called for ' . $name . ' with no $wgOut available' . "\n" );
+                               $notice = '';
+                       }
+               }
+
+               $notice = '<div id="localNotice">' .$notice . '</div>';
+               wfProfileOut( __METHOD__ );
+               return $notice;
+       }
+
+       /**
+        * Get a notice based on page's namespace
+        *
+        * @return String: HTML fragment
+        */
+       function getNamespaceNotice() {
+               wfProfileIn( __METHOD__ );
+
+               $key = 'namespacenotice-' . $this->mTitle->getNsText();
+               $namespaceNotice = wfGetCachedNotice( $key );
+               if ( $namespaceNotice && substr( $namespaceNotice, 0, 7 ) != '<p>&lt;' ) {
+                       $namespaceNotice = '<div id="namespacebanner">' . $namespaceNotice . '</div>';
+               } else {
+                       $namespaceNotice = '';
+               }
+
+               wfProfileOut( __METHOD__ );
+               return $namespaceNotice;
+       }
+
+       /**
+        * Get the site notice
+        *
+        * @return String: HTML fragment
+        */
+       function getSiteNotice() {
+               global $wgUser;
+
+               wfProfileIn( __METHOD__ );
+               $siteNotice = '';
+
+               if ( wfRunHooks( 'SiteNoticeBefore', array( &$siteNotice, $this ) ) ) {
+                       if ( is_object( $wgUser ) && $wgUser->isLoggedIn() ) {
+                               $siteNotice = $this->getCachedNotice( 'sitenotice' );
+                       } else {
+                               $anonNotice = $this->getCachedNotice( 'anonnotice' );
+                               if ( !$anonNotice ) {
+                                       $siteNotice = $this->getCachedNotice( 'sitenotice' );
+                               } else {
+                                       $siteNotice = $anonNotice;
+                               }
+                       }
+                       if ( !$siteNotice ) {
+                               $siteNotice = $this->getCachedNotice( 'default' );
+                       }
+               }
+
+               wfRunHooks( 'SiteNoticeAfter', array( &$siteNotice, $this ) );
+               wfProfileOut( __METHOD__ );
+               return $siteNotice;
+}
 }