Followup r94541 (reverts of r94289 undiscussed core schema change and followups)...
[lhc/web/wiklou.git] / includes / Skin.php
index 3b25570..5be5986 100644 (file)
@@ -15,19 +15,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  *
  * @ingroup Skins
  */
-abstract class Skin {
-       /**#@+
-        * @private
-        */
-       var $mWatchLinkNum = 0; // Appended to end of watch link id's
-       /**#@-*/
-       protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
+abstract class Skin extends ContextSource {
        protected $skinname = 'standard';
-       /**
-        * todo Fixme: should be protected :-\
-        * @var Title
-        */
-       var $mTitle = null;
        protected $mRelevantTitle = null;
        protected $mRelevantUser = null;
 
@@ -121,7 +110,7 @@ abstract class Skin {
 
                if ( isset( $skinNames[$key] ) ) {
                        return $key;
-               } else if ( isset( $skinNames[$wgDefaultSkin] ) ) {
+               } elseif ( isset( $skinNames[$wgDefaultSkin] ) ) {
                        return $wgDefaultSkin;
                } else {
                        return 'vector';
@@ -143,35 +132,34 @@ abstract class Skin {
                $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 ( !MWInit::classExists( $className ) ) {
 
-                       if ( file_exists( $deps ) ) {
-                               include_once( $deps );
+                       if ( !defined( 'MW_COMPILED' ) ) {
+                               // Preload base classes to work around APC/PHP5 bug
+                               $deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
+                               if ( file_exists( $deps ) ) {
+                                       include_once( $deps );
+                               }
+                               require_once( "{$wgStyleDirectory}/{$skinName}.php" );
                        }
-                       require_once( "{$wgStyleDirectory}/{$skinName}.php" );
 
                        # Check if we got if not failback to default skin
-                       if ( !class_exists( $className ) ) {
+                       if ( !MWInit::classExists( $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
                                # is no longer valid.
                                wfDebug( "Skin class does not exist: $className\n" );
                                $className = 'SkinVector';
-                               require_once( "{$wgStyleDirectory}/Vector.php" );
+                               if ( !defined( 'MW_COMPILED' ) ) {
+                                       require_once( "{$wgStyleDirectory}/Vector.php" );
+                               }
                        }
                }
                $skin = new $className;
                return $skin;
        }
 
-       /** @return string path to the skin stylesheet */
-       function getStylesheet() {
-               return 'common/wikistandard.css';
-       }
-
        /** @return string skin name */
        public function getSkinName() {
                return $this->skinname;
@@ -180,9 +168,7 @@ abstract class Skin {
        function initPage( OutputPage $out ) {
                wfProfileIn( __METHOD__ );
 
-               $this->mRevisionId = $out->mRevisionId;
                $this->preloadExistence();
-               $this->setMembers();
 
                wfProfileOut( __METHOD__ );
        }
@@ -191,18 +177,18 @@ abstract class Skin {
         * Preload the existence of three commonly-requested pages in a single query
         */
        function preloadExistence() {
-               global $wgUser;
+               $user = $this->getUser();
 
                // User/talk link
-               $titles = array( $wgUser->getUserPage(), $wgUser->getTalkPage() );
+               $titles = array( $user->getUserPage(), $user->getTalkPage() );
 
                // Other tab link
-               if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
+               if ( $this->getTitle()->getNamespace() == NS_SPECIAL ) {
                        // nothing
-               } elseif ( $this->mTitle->isTalkPage() ) {
-                       $titles[] = $this->mTitle->getSubjectPage();
+               } elseif ( $this->getTitle()->isTalkPage() ) {
+                       $titles[] = $this->getTitle()->getSubjectPage();
                } else {
-                       $titles[] = $this->mTitle->getTalkPage();
+                       $titles[] = $this->getTitle()->getTalkPage();
                }
 
                $lb = new LinkBatch( $titles );
@@ -211,13 +197,12 @@ abstract class Skin {
        }
 
        /**
-        * Set some local variables
+        * Get the current revision ID
+        *
+        * @return Integer
         */
-       protected function setMembers() {
-               global $wgUser;
-               $this->mUser = $wgUser;
-               $this->userpage = $wgUser->getUserPage()->getPrefixedText();
-               $this->usercss = false;
+       public function getRevisionId() {
+               return $this->getOutput()->getRevisionId();
        }
 
        /**
@@ -226,23 +211,8 @@ abstract class Skin {
         * @return Boolean
         */
        public function isRevisionCurrent() {
-               return $this->mRevisionId == 0 || $this->mRevisionId == $this->mTitle->getLatestRevID();
-       }
-
-       /**
-        * Set the title
-        * @param $t Title object to use
-        */
-       public function setTitle( $t ) {
-               $this->mTitle = $t;
-       }
-
-       /** Get the title
-        *
-        * @return Title
-        */
-       public function getTitle() {
-               return $this->mTitle;
+               $revID = $this->getRevisionId();
+               return $revID == 0 || $revID == $this->getTitle()->getLatestRevID();
        }
 
        /**
@@ -261,12 +231,14 @@ abstract class Skin {
         * 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.
+        *
+        * @return Title
         */
        public function getRelevantTitle() {
                if ( isset($this->mRelevantTitle) ) {
                        return $this->mRelevantTitle;
                }
-               return $this->mTitle;
+               return $this->getTitle();
        }
 
        /**
@@ -284,6 +256,7 @@ abstract class Skin {
         * 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.
+        * @return User
         */
        public function getRelevantUser() {
                if ( isset($this->mRelevantUser) ) {
@@ -307,40 +280,9 @@ abstract class Skin {
 
        /**
         * Outputs the HTML generated by other functions.
-        * @param $out Object: instance of OutputPage
-        * @todo Exterminate!
+        * @param $out OutputPage
         */
-       function outputPage( OutputPage $out ) {
-               global $wgDebugComments;
-               wfProfileIn( __METHOD__ );
-
-               $this->initPage( $out );
-
-               // See self::afterContentHook() for documentation
-               $afterContent = $this->afterContentHook();
-
-               $out->out( $out->headElement( $this ) );
-
-               if ( $wgDebugComments ) {
-                       $out->out( "<!-- Debug output:\n" .
-                         $out->mDebugtext . "-->\n" );
-               }
-
-               $out->out( $this->beforeContent() );
-
-               $out->out( $out->mBodytext . "\n" );
-
-               $out->out( $this->afterContent() );
-
-               $out->out( $afterContent );
-
-               $out->out( $this->bottomScripts( $out ) );
-
-               $out->out( wfReportTime() );
-
-               $out->out( "\n</body></html>" );
-               wfProfileOut( __METHOD__ );
-       }
+       abstract function outputPage( OutputPage $out );
 
        static function makeVariablesScript( $data ) {
                if ( $data ) {
@@ -349,122 +291,34 @@ abstract class Skin {
                        );
                } else {
                        return '';
-               } 
-       }
-
-       /**
-        * To make it harder for someone to slip a user a fake
-        * user-JavaScript or user-CSS preview, a random token
-        * is associated with the login session. If it's not
-        * passed back with the preview request, we won't render
-        * the code.
-        *
-        * @param $action String: 'edit', 'submit' etc.
-        * @return bool
-        */
-       public function userCanPreview( $action ) {
-               global $wgRequest, $wgUser;
-
-               if ( $action != 'submit' ) {
-                       return false;
-               }
-               if ( !$wgRequest->wasPosted() ) {
-                       return false;
                }
-               if ( !$this->mTitle->userCanEditCssSubpage() ) {
-                       return false;
-               }
-               if ( !$this->mTitle->userCanEditJsSubpage() ) {
-                       return false;
-               }
-
-               return $wgUser->matchEditToken(
-                       $wgRequest->getVal( 'wpEditToken' ) );
        }
 
        /**
         * Generated JavaScript action=raw&gen=js
-        * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
-        * nated together.  For some bizarre reason, it does *not* return any
-        * custom user JS from subpages.  Huh?
-        *
-        * There's absolutely no reason to have separate Monobook/Common JSes.
-        * Any JS that cares can just check the skin variable generated at the
-        * top.  For now Monobook.js will be maintained, but it should be consi-
-        * dered deprecated.
+        * This used to load MediaWiki:Common.js and the skin-specific style
+        * before the ResourceLoader.
         *
+        * @deprecated since 1.18 Use the ResourceLoader instead. This may be removed at some
+        * point.
         * @param $skinName String: If set, overrides the skin name
-        * @return string
+        * @return String
         */
        public function generateUserJs( $skinName = null ) {
-               
-               // Stub - see ResourceLoaderSiteModule, CologneBlue, Simple and Standard skins override this
-               
                return '';
        }
 
        /**
         * Generate user stylesheet for action=raw&gen=css
+        *
+        * @deprecated since 1.18 Use the ResourceLoader instead. This may be removed at some
+        * point.
+        * @return String
         */
        public function generateUserStylesheet() {
-               
-               // Stub - see ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this
-               
                return '';
        }
 
-       /**
-        * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
-        * Anything in here won't be generated if $wgAllowUserCssPrefs is false.
-        */
-       protected function reallyGenerateUserStylesheet() {
-               
-               // Stub - see  ResourceLoaderUserModule, CologneBlue, Simple and Standard skins override this
-               
-               return '';
-       }
-
-       /**
-        * @private
-        */
-       function setupUserCss( OutputPage $out ) {
-               global $wgRequest, $wgUser;
-               global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs;
-
-               wfProfileIn( __METHOD__ );
-
-               $this->setupSkinUserCss( $out );
-               // Add any extension CSS
-               foreach ( $out->getExtStyle() as $url ) {
-                       $out->addStyle( $url );
-               }
-
-               // Per-site custom styles
-               if ( $wgUseSiteCss ) {
-                       $out->addModuleStyles( array( 'site', 'noscript' ) );
-                       if( $wgUser->isLoggedIn() ){
-                               $out->addModuleStyles( 'user.groups' );
-                       }
-               }
-
-               // 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 {
-                               $out->addModuleStyles( 'user' );
-                       }
-               }
-
-               // Per-user preference styles
-               if ( $wgAllowUserCssPrefs ) {
-                       $out->addModuleStyles( 'user.options' );
-               }
-
-               wfProfileOut( __METHOD__ );
-       }
-
        /**
         * Get the query to generate a dynamic stylesheet
         *
@@ -484,18 +338,26 @@ abstract class Skin {
 
        /**
         * Add skin specific stylesheets
+        * Calling this method with an $out of anything but the same OutputPage
+        * inside ->getOutput() is deprecated. The $out arg is kept
+        * for compatibility purposes with skins.
         * @param $out OutputPage
         * @delete
         */
        abstract function setupSkinUserCss( OutputPage $out );
 
+       /**
+        * TODO: document
+        * @param $title Title
+        * @return String
+        */
        function getPageClasses( $title ) {
                $numeric = 'ns-' . $title->getNamespace();
 
                if ( $title->getNamespace() == NS_SPECIAL ) {
                        $type = 'ns-special';
                        // bug 23315: provide a class based on the canonical special page name without subpages
-                       list( $canonicalName ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
+                       list( $canonicalName ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
                        if ( $canonicalName ) {
                                $type .= ' ' . Sanitizer::escapeClass( "mw-special-$canonicalName" );
                        } else {
@@ -516,6 +378,8 @@ abstract class Skin {
         * 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.
+        * @param $out OutputPage
+        * @param $bodyAttrs Array
         */
        function addToBodyAttributes( $out, &$bodyAttrs ) {
                // does nothing by default
@@ -523,55 +387,43 @@ abstract class Skin {
 
        /**
         * URL to the logo
+        * @return String
         */
        function getLogo() {
                global $wgLogo;
                return $wgLogo;
        }
 
-       /**
-        * The format without an explicit $out argument is deprecated
-        */
-       function getCategoryLinks( OutputPage $out=null ) {
-               global $wgUseCategoryBrowser, $wgContLang, $wgUser;
+       function getCategoryLinks() {
+               global $wgUseCategoryBrowser;
 
-               if ( is_null( $out ) ) {
-                       // Backwards compatibility for when there was no $out arg
-                       global $wgOut;
-                       $out = $wgOut;
-               }
+               $out = $this->getOutput();
+               $allCats = $out->getCategoryLinks();
 
-               if ( count( $out->mCategoryLinks ) == 0 ) {
+               if ( !count( $allCats ) ) {
                        return '';
                }
 
-               # Separator
-               $sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities' ) );
+               $embed = "<li>";
+               $pop = "</li>";
 
-               // Use Unicode bidi embedding override characters,
-               // to make sure links don't smash each other up in ugly ways.
-               $dir = $wgContLang->getDir();
-               $embed = "<span dir='$dir'>";
-               $pop = '</span>';
-
-               $allCats = $out->getCategoryLinks();
                $s = '';
                $colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 
                if ( !empty( $allCats['normal'] ) ) {
-                       $t = $embed . implode( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
+                       $t = $embed . implode( "{$pop}{$embed}" , $allCats['normal'] ) . $pop;
 
                        $msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
                        $s .= '<div id="mw-normal-catlinks">' .
-                               $this->link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
-                               . $colon . $t . '</div>';
+                               Linker::link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
+                               . $colon . '<ul>' . $t . '</ul>' . '</div>';
                }
 
                # Hidden categories
                if ( isset( $allCats['hidden'] ) ) {
-                       if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
+                       if ( $this->getUser()->getBoolOption( 'showhiddencats' ) ) {
                                $class = 'mw-hidden-cats-user-shown';
-                       } elseif ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
+                       } elseif ( $this->getTitle()->getNamespace() == NS_CATEGORY ) {
                                $class = 'mw-hidden-cats-ns-shown';
                        } else {
                                $class = 'mw-hidden-cats-hidden';
@@ -579,7 +431,7 @@ abstract class Skin {
 
                        $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 .
+                               $colon . '<ul>' . $embed . implode( "{$pop}{$embed}" , $allCats['hidden'] ) . $pop . '</ul>' .
                                '</div>';
                }
 
@@ -589,10 +441,10 @@ abstract class Skin {
                        $s .= '<br /><hr />';
 
                        # get a big array of the parents tree
-                       $parenttree = $this->mTitle->getParentCategoryTree();
+                       $parenttree = $this->getTitle()->getParentCategoryTree();
                        # Skin object passed by reference cause it can not be
                        # accessed under the method subfunction drawCategoryBrowser
-                       $tempout = explode( "\n", $this->drawCategoryBrowser( $parenttree, $this ) );
+                       $tempout = explode( "\n", $this->drawCategoryBrowser( $parenttree ) );
                        # Clean out bogus first entry and sort them
                        unset( $tempout[0] );
                        asort( $tempout );
@@ -606,10 +458,9 @@ abstract class Skin {
        /**
         * Render the array as a serie of links.
         * @param $tree Array: categories tree returned by Title::getParentCategoryTree
-        * @param &skin Object: skin passed by reference
         * @return String separated by &gt;, terminate with "\n"
         */
-       function drawCategoryBrowser( $tree, &$skin ) {
+       function drawCategoryBrowser( $tree ) {
                $return = '';
 
                foreach ( $tree as $element => $parent ) {
@@ -618,38 +469,28 @@ abstract class Skin {
                                $return .= "\n";
                        } else {
                                # grab the others elements
-                               $return .= $this->drawCategoryBrowser( $parent, $skin ) . ' &gt; ';
+                               $return .= $this->drawCategoryBrowser( $parent ) . ' &gt; ';
                        }
 
                        # add our current element to the list
                        $eltitle = Title::newFromText( $element );
-                       $return .=  $skin->link( $eltitle, $eltitle->getText() );
+                       $return .=  Linker::link( $eltitle, htmlspecialchars( $eltitle->getText() ) );
                }
 
                return $return;
        }
 
-       /**
-        * The ->getCategories() form is deprecated, please instead use
-        * the ->getCategories( $out ) form with whatout OutputPage is on hand
-        */
-       function getCategories( OutputPage $out=null ) {
-               if ( is_null( $out ) ) {
-                       // Backwards compatibility for when there was no $out arg
-                       global $wgOut;
-                       $out = $wgOut;
-               }
+       function getCategories() {
+               $out = $this->getOutput();
 
-               $catlinks = $this->getCategoryLinks( $out );
+               $catlinks = $this->getCategoryLinks();
 
                $classes = 'catlinks';
 
-               global $wgUser;
-
                // Check what we're showing
                $allCats = $out->getCategoryLinks();
-               $showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
-                                               $this->mTitle->getNamespace() == NS_CATEGORY;
+               $showHidden = $this->getUser()->getBoolOption( 'showhiddencats' ) ||
+                                               $this->getTitle()->getNamespace() == NS_CATEGORY;
 
                if ( empty( $allCats['normal'] ) && !( !empty( $allCats['hidden'] ) && $showHidden ) ) {
                        $classes .= ' catlinks-allhidden';
@@ -670,7 +511,7 @@ abstract class Skin {
         * The output of this function gets processed in SkinTemplate::outputPage() for
         * the SkinTemplate based skins, all other skins should directly echo it.
         *
-        * Returns an empty string by default, if not changed by any hook function.
+        * @return String, empty by default, if not changed by any hook function.
         */
        protected function afterContentHook() {
                $data = '';
@@ -698,11 +539,11 @@ abstract class Skin {
         * area.
         * @return String HTML containing debug data, if enabled (otherwise empty).
         */
-       protected function generateDebugHTML( OutputPage $out ) {
+       protected function generateDebugHTML() {
                global $wgShowDebug;
 
                if ( $wgShowDebug ) {
-                       $listInternals = $this->formatDebugHTML( $out->mDebugtext );
+                       $listInternals = $this->formatDebugHTML( $this->getOutput()->mDebugtext );
                        return "\n<hr />\n<strong>Debug data:</strong><ul id=\"mw-debug-html\">" .
                                $listInternals . "</ul>\n";
                }
@@ -762,11 +603,14 @@ abstract class Skin {
 
        /**
         * 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( $out ) {
-               $bottomScriptText = "\n" . $out->getHeadScripts( $this );
+       function bottomScripts() {
+               // TODO and the suckage continues. This function is really just a wrapper around
+               // OutputPage::getBottomScripts() which takes a Skin param. This should be cleaned
+               // up at some point
+               $bottomScriptText = $this->getOutput()->getBottomScripts();
                wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
 
                return $bottomScriptText;
@@ -774,21 +618,21 @@ abstract class Skin {
 
        /** @return string Retrievied from HTML text */
        function printSource() {
-               $url = htmlspecialchars( $this->mTitle->getFullURL() );
+               $url = htmlspecialchars( $this->getTitle()->getFullURL() );
                return wfMsg( 'retrievedfrom', '<a href="' . $url . '">' . $url . '</a>' );
        }
 
        function getUndeleteLink() {
-               global $wgUser, $wgLang, $wgRequest;
+               $action = $this->getRequest()->getVal( 'action', 'view' );
 
-               $action = $wgRequest->getVal( 'action', 'view' );
+               if ( $this->getUser()->isAllowed( 'deletedhistory' ) && !$this->getUser()->isBlocked() &&
+                       ( $this->getTitle()->getArticleId() == 0 || $action == 'history' ) ) {
 
-               if ( $wgUser->isAllowed( 'deletedhistory' ) &&
-                       ( $this->mTitle->getArticleId() == 0 || $action == 'history' ) ) {
-                       $n = $this->mTitle->isDeleted();
+                       $includeSuppressed = $this->getUser()->isAllowed( 'suppressrevision' );
+                       $n = $this->getTitle()->isDeleted( $includeSuppressed );
 
                        if ( $n ) {
-                               if ( $wgUser->isAllowed( 'undelete' ) ) {
+                               if ( $this->getUser()->isAllowed( 'undelete' ) ) {
                                        $msg = 'thisisdeleted';
                                } else {
                                        $msg = 'viewdeleted';
@@ -796,12 +640,9 @@ abstract class Skin {
 
                                return wfMsg(
                                        $msg,
-                                       $this->link(
-                                               SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
-                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ),
-                                               array(),
-                                               array(),
-                                               array( 'known', 'noclasses' )
+                                       Linker::linkKnown(
+                                               SpecialPage::getTitleFor( 'Undelete', $this->getTitle()->getPrefixedDBkey() ),
+                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $this->getLang()->formatNum( $n ) )
                                        )
                                );
                        }
@@ -810,16 +651,8 @@ abstract class Skin {
                return '';
        }
 
-       /**
-        * The format without an explicit $out argument is deprecated
-        */
-       function subPageSubtitle( OutputPage $out=null ) {
-               if ( is_null( $out ) ) {
-                       // Backwards compatibility for when there was no $out arg
-                       global $wgOut;
-                       $out = $wgOut;
-               }
-
+       function subPageSubtitle() {
+               $out = $this->getOutput();
                $subpages = '';
 
                if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this, $out ) ) ) {
@@ -827,7 +660,7 @@ abstract class Skin {
                }
 
                if ( $out->isArticle() && MWNamespace::hasSubpages( $out->getTitle()->getNamespace() ) ) {
-                       $ptext = $this->mTitle->getPrefixedText();
+                       $ptext = $this->getTitle()->getPrefixedText();
                        if ( preg_match( '/\//', $ptext ) ) {
                                $links = explode( '/', $ptext );
                                array_pop( $links );
@@ -841,12 +674,9 @@ abstract class Skin {
                                        $linkObj = Title::newFromText( $growinglink );
 
                                        if ( is_object( $linkObj ) && $linkObj->exists() ) {
-                                               $getlink = $this->link(
+                                               $getlink = Linker::linkKnown(
                                                        $linkObj,
-                                                       htmlspecialchars( $display ),
-                                                       array(),
-                                                       array(),
-                                                       array( 'known', 'noclasses' )
+                                                       htmlspecialchars( $display )
                                                );
 
                                                $c++;
@@ -872,6 +702,7 @@ abstract class Skin {
 
        /**
         * Returns true if the IP should be shown in the header
+        * @return Bool
         */
        function showIPinHeader() {
                global $wgShowIPinHeader;
@@ -888,12 +719,10 @@ abstract class Skin {
        }
 
        function getCopyright( $type = 'detect' ) {
-               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText;
 
                if ( $type == 'detect' ) {
-                       $diff = $wgRequest->getVal( 'diff' );
-
-                       if ( is_null( $diff ) && !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+                       if ( !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
                                $type = 'history';
                        } else {
                                $type = 'normal';
@@ -906,32 +735,28 @@ abstract class Skin {
                        $msg = 'copyright';
                }
 
-               $out = '';
-
                if ( $wgRightsPage ) {
                        $title = Title::newFromText( $wgRightsPage );
-                       $link = $this->linkKnown( $title, $wgRightsText );
+                       $link = Linker::linkKnown( $title, $wgRightsText );
                } elseif ( $wgRightsUrl ) {
-                       $link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
+                       $link = Linker::makeExternalLink( $wgRightsUrl, $wgRightsText );
                } elseif ( $wgRightsText ) {
                        $link = $wgRightsText;
                } else {
                        # Give up now
-                       return $out;
+                       return '';
                }
 
                // Allow for site and per-namespace customization of copyright notice.
                $forContent = true;
 
-               wfRunHooks( 'SkinCopyrightFooter', array( $this->mTitle, $type, &$msg, &$link, &$forContent ) );
+               wfRunHooks( 'SkinCopyrightFooter', array( $this->getTitle(), $type, &$msg, &$link, &$forContent ) );
 
                if ( $forContent ) {
-                       $out .= wfMsgForContent( $msg, $link );
+                       return wfMsgForContent( $msg, $link );
                } else {
-                       $out .= wfMsg( $msg, $link );
+                       return wfMsg( $msg, $link );
                }
-
-               return $out;
        }
 
        function getCopyrightIcon() {
@@ -969,7 +794,7 @@ abstract class Skin {
 
                $url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
                $text = '<a href="http://www.mediawiki.org/"><img src="' . $url . '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
-               wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );       
+               wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );
                return $text;
        }
 
@@ -980,17 +805,15 @@ abstract class Skin {
         * @return String
         */
        protected function lastModified( $article ) {
-               global $wgLang;
-
                if ( !$this->isRevisionCurrent() ) {
-                       $timestamp = Revision::getTimestampFromId( $this->mTitle, $this->mRevisionId );
+                       $timestamp = Revision::getTimestampFromId( $this->getTitle(), $this->getRevisionId() );
                } else {
                        $timestamp = $article->getTimestamp();
                }
 
                if ( $timestamp ) {
-                       $d = $wgLang->date( $timestamp, true );
-                       $t = $wgLang->time( $timestamp, true );
+                       $d = $this->getLang()->date( $timestamp, true );
+                       $t = $this->getLang()->time( $timestamp, true );
                        $s = ' ' . wfMsg( 'lastmodifiedat', $d, $t );
                } else {
                        $s = '';
@@ -1010,7 +833,7 @@ abstract class Skin {
                        $a = '';
                }
 
-               $mp = wfMsg( 'mainpage' );
+               $mp = wfMsgHtml( 'mainpage' );
                $mptitle = Title::newMainPage();
                $url = ( is_object( $mptitle ) ? $mptitle->escapeLocalURL() : '' );
 
@@ -1023,7 +846,8 @@ abstract class Skin {
        /**
         * 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
+        * @param $withImage Bool|String: Whether to use the icon's image or output a text-only footericon
+        * @return String HTML
         */
        function makeFooterIcon( $icon, $withImage = 'withImage' ) {
                if ( is_string( $icon ) ) {
@@ -1048,12 +872,9 @@ abstract class Skin {
         * @return string
         */
        function mainPageLink() {
-               $s = $this->link(
+               $s = Linker::linkKnown(
                        Title::newMainPage(),
-                       wfMsg( 'mainpage' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
+                       wfMsgHtml( 'mainpage' )
                );
 
                return $s;
@@ -1070,7 +891,7 @@ abstract class Skin {
                        // but we make the link target be the one site-wide page.
                        $title = Title::newFromText( wfMsgForContent( $page ) );
 
-                       return $this->linkKnown(
+                       return Linker::linkKnown(
                                $title,
                                wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) )
                        );
@@ -1079,6 +900,7 @@ abstract class Skin {
 
        /**
         * Gets the link to the wiki's privacy policy page.
+        * @return String HTML
         */
        function privacyLink() {
                return $this->footerLink( 'privacy', 'privacypage' );
@@ -1086,6 +908,7 @@ abstract class Skin {
 
        /**
         * Gets the link to the wiki's about page.
+        * @return String HTML
         */
        function aboutLink() {
                return $this->footerLink( 'aboutsite', 'aboutpage' );
@@ -1093,6 +916,7 @@ abstract class Skin {
 
        /**
         * Gets the link to the wiki's general disclaimers page.
+        * @return String HTML
         */
        function disclaimerLink() {
                return $this->footerLink( 'disclaimers', 'disclaimerpage' );
@@ -1109,16 +933,15 @@ abstract class Skin {
                $options = array( 'action' => 'edit' );
 
                if ( !$this->isRevisionCurrent() ) {
-                       $options['oldid'] = intval( $this->mRevisionId );
+                       $options['oldid'] = intval( $this->getRevisionId() );
                }
 
                return $options;
        }
 
        function showEmailUser( $id ) {
-               global $wgUser;
                $targetUser = User::newFromId( $id );
-               return $wgUser->canSendEmail() && # the sending user must have a confirmed email address
+               return $this->getUser()->canSendEmail() && # the sending user must have a confirmed email address
                        $targetUser->canReceiveEmail(); # the target user must have a confirmed email address and allow emails from users
        }
 
@@ -1155,7 +978,7 @@ abstract class Skin {
        }
 
        static function makeSpecialUrl( $name, $urlaction = '' ) {
-               $title = SpecialPage::getTitleFor( $name );
+               $title = SpecialPage::getSafeTitleFor( $name );
                return $title->getLocalURL( $urlaction );
        }
 
@@ -1180,6 +1003,8 @@ abstract class Skin {
        /**
         * If url string starts with http, consider as external URL, else
         * internal
+        * @param $name String
+        * @return String URL
         */
        static function makeInternalOrExternalUrl( $name ) {
                if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $name ) ) {
@@ -1210,6 +1035,9 @@ abstract class Skin {
 
        /**
         * Make URL details where the article exists (or at least it's convenient to think so)
+        * @param $name String Article name
+        * @param $urlaction String
+        * @return Array
         */
        static function makeKnownUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
@@ -1238,10 +1066,9 @@ abstract class Skin {
         */
        function buildSidebar() {
                global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
-               global $wgLang;
                wfProfileIn( __METHOD__ );
 
-               $key = wfMemcKey( 'sidebar', $wgLang->getCode() );
+               $key = wfMemcKey( 'sidebar', $this->getLang()->getCode() );
 
                if ( $wgEnableSidebarCache ) {
                        $cachedsidebar = $parserMemc->get( $key );
@@ -1280,6 +1107,7 @@ abstract class Skin {
         * @since 1.17
         * @param &$bar array
         * @param $text string
+        * @return Array
         */
        function addToSidebarPlain( &$bar, $text ) {
                $lines = explode( "\n", $text );
@@ -1291,6 +1119,7 @@ abstract class Skin {
                        if ( strpos( $line, '*' ) !== 0 ) {
                                continue;
                        }
+                       $line = rtrim( $line, "\r" ); // for Windows compat
 
                        if ( strpos( $line, '**' ) !== 0 ) {
                                $heading = trim( $line, '* ' );
@@ -1301,26 +1130,51 @@ abstract class Skin {
                                $line = trim( $line, '* ' );
 
                                if ( strpos( $line, '|' ) !== false ) { // sanity check
-                                       $line = MessageCache::singleton()->transform( $line, false, null, $this->mTitle );
+                                       $line = MessageCache::singleton()->transform( $line, false, null, $this->getTitle() );
                                        $line = array_map( 'trim', explode( '|', $line, 2 ) );
-                                       $link = wfMsgForContent( $line[0] );
+                                       $extraAttribs = array();
 
-                                       if ( $link == '-' ) {
-                                               continue;
+                                       $msgLink = wfMessage( $line[0] )->inContentLanguage();
+                                       if ( $msgLink->exists() ) {
+                                               $link = $msgLink->text();
+                                               if ( $link == '-' ) {
+                                                       continue;
+                                               }
+                                       } else {
+                                               $link = $line[0];
                                        }
 
-                                       $text = wfMsgExt( $line[1], 'parsemag' );
-
-                                       if ( wfEmptyMsg( $line[1] ) ) {
+                                       $msgText = wfMessage( $line[1] );
+                                       if ( $msgText->exists() ) {
+                                               $text = $msgText->text();
+                                       } else {
                                                $text = $line[1];
                                        }
 
-                                       if ( wfEmptyMsg( $line[0] ) ) {
-                                               $link = $line[0];
-                                       }
-
                                        if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
                                                $href = $link;
+                                               //Parser::getExternalLinkAttribs won't work here because of the Namespace things
+                                               global $wgNoFollowLinks;
+                                               if ( $wgNoFollowLinks ) {
+                                                       $extraAttribs['rel'] = 'nofollow';
+
+                                                       global $wgNoFollowDomainExceptions;
+                                                       if ( $wgNoFollowDomainExceptions ) {
+                                                               $bits = wfParseUrl( $url );
+                                                               if ( is_array( $bits ) && isset( $bits['host'] ) ) {
+                                                                       foreach ( $wgNoFollowDomainExceptions as $domain ) {
+                                                                               if ( substr( $bits['host'], -strlen( $domain ) ) == $domain ) {
+                                                                                       unset( $extraAttribs['rel'] );
+                                                                                       break;
+                                                                               }
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                               global $wgExternalLinkTarget;
+                                               if ( $wgExternalLinkTarget) {
+                                                       $extraAttribs['target'] = $wgExternalLinkTarget;
+                                               }
                                        } else {
                                                $title = Title::newFromText( $link );
 
@@ -1332,13 +1186,13 @@ abstract class Skin {
                                                }
                                        }
 
-                                       $bar[$heading][] = array(
+                                       $bar[$heading][] = array_merge( array(
                                                'text' => $text,
                                                'href' => $href,
-                                               'id' => 'n-' . strtr( $line[1], ' ', '-' ),
+                                               'id' => 'n-' . Sanitizer::escapeId( strtr( $line[1], ' ', '-' ), 'noninitial' ),
                                                'active' => false
-                                       );
-                               } else if ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
+                                       ), $extraAttribs );
+                               } elseif ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
                                        global $wgParser;
 
                                        $line = substr( $line, 2, strlen( $line ) - 4 );
@@ -1346,7 +1200,7 @@ abstract class Skin {
                                        $options = new ParserOptions();
                                        $options->setEditSection( false );
                                        $options->setInterfaceMessage( true );
-                                       $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $this->mTitle, $options )->getText();
+                                       $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $this->getTitle(), $options )->getText();
                                } else {
                                        continue;
                                }
@@ -1375,39 +1229,30 @@ abstract class Skin {
        /**
         * Gets new talk page messages for the current user.
         * @return MediaWiki message or if no new talk page messages, nothing
-        * The format without an explicit $out argument is deprecated
         */
-       function getNewtalks( OutputPage $out=null ) {
-               global $wgUser;
-
-               if ( is_null( $out ) ) {
-                       // Backwards compatibility for when there was no $out arg
-                       global $wgOut;
-                       $out = $wgOut;
-               }
+       function getNewtalks() {
+               $out = $this->getOutput();
 
-               $newtalks = $wgUser->getNewMessageLinks();
+               $newtalks = $this->getUser()->getNewMessageLinks();
                $ntl = '';
 
                if ( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-                       $userTitle = $this->mUser->getUserPage();
+                       $userTitle = $this->getUser()->getUserPage();
                        $userTalkTitle = $userTitle->getTalkPage();
 
                        if ( !$userTalkTitle->equals( $out->getTitle() ) ) {
-                               $newMessagesLink = $this->link(
+                               $newMessagesLink = Linker::linkKnown(
                                        $userTalkTitle,
                                        wfMsgHtml( 'newmessageslink' ),
                                        array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
+                                       array( 'redirect' => 'no' )
                                );
 
-                               $newMessagesDiffLink = $this->link(
+                               $newMessagesDiffLink = Linker::linkKnown(
                                        $userTalkTitle,
                                        wfMsgHtml( 'newmessagesdifflink' ),
                                        array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
+                                       array( 'diff' => 'cur' )
                                );
 
                                $ntl = wfMsg(
@@ -1444,7 +1289,7 @@ abstract class Skin {
         * @return String: HTML fragment
         */
        private function getCachedNotice( $name ) {
-               global $wgOut, $wgRenderHashAppend, $parserMemc;
+               global $wgRenderHashAppend, $parserMemc, $wgContLang;
 
                wfProfileIn( __METHOD__ );
 
@@ -1481,17 +1326,13 @@ abstract class Skin {
                }
 
                if ( $needParse ) {
-                       if( is_object( $wgOut ) ) {
-                               $parsed = $wgOut->parse( $notice );
-                               $parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
-                               $notice = $parsed;
-                       } else {
-                               wfDebug( 'Skin::getCachedNotice called for ' . $name . ' with no $wgOut available' . "\n" );
-                               $notice = '';
-                       }
+                       $parsed = $this->getOutput()->parse( $notice );
+                       $parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+                       $notice = $parsed;
                }
 
-               $notice = '<div id="localNotice">' .$notice . '</div>';
+               $notice = Html::rawElement( 'div', array( 'id' => 'localNotice',
+                       'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ), $notice );
                wfProfileOut( __METHOD__ );
                return $notice;
        }
@@ -1504,7 +1345,7 @@ abstract class Skin {
        function getNamespaceNotice() {
                wfProfileIn( __METHOD__ );
 
-               $key = 'namespacenotice-' . $this->mTitle->getNsText();
+               $key = 'namespacenotice-' . $this->getTitle()->getNsText();
                $namespaceNotice = $this->getCachedNotice( $key );
                if ( $namespaceNotice && substr( $namespaceNotice, 0, 7 ) != '<p>&lt;' ) {
                        $namespaceNotice = '<div id="namespacebanner">' . $namespaceNotice . '</div>';
@@ -1522,13 +1363,11 @@ abstract class Skin {
         * @return String: HTML fragment
         */
        function getSiteNotice() {
-               global $wgUser;
-
                wfProfileIn( __METHOD__ );
                $siteNotice = '';
 
                if ( wfRunHooks( 'SiteNoticeBefore', array( &$siteNotice, $this ) ) ) {
-                       if ( is_object( $wgUser ) && $wgUser->isLoggedIn() ) {
+                       if ( is_object( $this->getUser() ) && $this->getUser()->isLoggedIn() ) {
                                $siteNotice = $this->getCachedNotice( 'sitenotice' );
                        } else {
                                $anonNotice = $this->getCachedNotice( 'anonnotice' );
@@ -1568,7 +1407,7 @@ abstract class Skin {
                if ( !is_null( $tooltip ) ) {
                        # Bug 25462: undo double-escaping.
                        $tooltip = Sanitizer::decodeCharReferences( $tooltip );
-                       $attribs['title'] = wfMsgReal( 'editsectionhint', array( $tooltip ), true, $lang );
+                       $attribs['title'] = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag' ), $tooltip );
                }
                $link = Linker::link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ),
                        $attribs,
@@ -1580,7 +1419,7 @@ abstract class Skin {
                # we can rid of it someday.
                $attribs = '';
                if ( $tooltip ) {
-                       $attribs = htmlspecialchars( wfMsgReal( 'editsectionhint', array( $tooltip ), true, $lang ) );
+                       $attribs = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'escape' ), $tooltip );
                        $attribs = " title=\"$attribs\"";
                }
                $result = null;
@@ -1611,11 +1450,12 @@ abstract class Skin {
         * @param $args Array Arguments to the method
         */
        function __call( $fname, $args ) {
-               if ( method_exists( 'Linker', $fname ) ) {
-                       return call_user_func_array( array( 'Linker', $fname ), $args );
+               $realFunction = array( 'Linker', $fname );
+               if ( is_callable( $realFunction ) ) {
+                       return call_user_func_array( $realFunction, $args );
                } else {
                        $className = get_class( $this );
-                       throw new MWException( "Call to undefined method $className::$fName" );
+                       throw new MWException( "Call to undefined method $className::$fname" );
                }
        }