Make $wgDebugRawPage=false also ignore load.php, so that debug logs can be readable...
[lhc/web/wiklou.git] / includes / Skin.php
index 3a671dc..cab34d2 100644 (file)
@@ -15,24 +15,11 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  *
  * @ingroup Skins
  */
-abstract class Skin extends Linker {
-       /**#@+
-        * @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 {
        protected $skinname = 'standard';
-       // @todo Fixme: should be protected :-\
-       var $mTitle = null;
        protected $mRelevantTitle = null;
        protected $mRelevantUser = null;
 
-       /** Constructor, call parent constructor */
-       function __construct() {
-               parent::__construct();
-       }
-
        /**
         * Fetch the set of available skins.
         * @return array of strings
@@ -145,24 +132,28 @@ abstract class Skin extends Linker {
                $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;
@@ -180,47 +171,10 @@ abstract class Skin extends Linker {
        }
 
        function initPage( OutputPage $out ) {
-               global $wgFavicon, $wgAppleTouchIcon, $wgEnableAPI;
-
                wfProfileIn( __METHOD__ );
 
-               # Generally the order of the favicon and apple-touch-icon links
-               # should not matter, but Konqueror (3.5.9 at least) incorrectly
-               # uses whichever one appears later in the HTML source. Make sure
-               # apple-touch-icon is specified first to avoid this.
-               if ( false !== $wgAppleTouchIcon ) {
-                       $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
-               }
-
-               if ( false !== $wgFavicon ) {
-                       $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
-               }
-
-               # OpenSearch description link
-               $out->addLink( array(
-                       'rel' => 'search',
-                       '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 );
-
-               $this->mRevisionId = $out->mRevisionId;
-
                $this->preloadExistence();
+               $this->setMembers();
 
                wfProfileOut( __METHOD__ );
        }
@@ -229,18 +183,18 @@ abstract class Skin extends Linker {
         * Preload the existence of three commonly-requested pages in a single query
         */
        function preloadExistence() {
-               global $wgUser;
-
+               $user = $this->getContext()->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 );
@@ -249,95 +203,57 @@ abstract class Skin extends Linker {
        }
 
        /**
-        * 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
+        * Set some local variables
         */
-       function addMetadataLinks( OutputPage $out ) {
-               global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
-               global $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang;
-               global $wgRightsPage, $wgRightsUrl;
-
-               if ( $out->isArticleRelated() ) {
-                       # note: buggy CC software only reads first "meta" link
-                       if ( $wgEnableCreativeCommonsRdf ) {
-                               $out->addMetadataLink( array(
-                                       'title' => 'Creative Commons',
-                                       'type' => 'application/rdf+xml',
-                                       'href' => $this->mTitle->getLocalURL( 'action=creativecommons' ) )
-                               );
-                       }
-
-                       if ( $wgEnableDublinCoreRdf ) {
-                               $out->addMetadataLink( array(
-                                       'title' => 'Dublin Core',
-                                       'type' => 'application/rdf+xml',
-                                       'href' => $this->mTitle->getLocalURL( 'action=dublincore' ) )
-                               );
-                       }
-               }
-
-               if ( !$wgDisableLangConversion && $wgCanonicalLanguageLinks
-                       && $wgContLang->hasVariants() ) {
-
-                       $urlvar = $wgContLang->getURLVariant();
+       protected function setMembers() {
+               $this->userpage = $this->getContext()->getUser()->getUserPage()->getPrefixedText();
+       }
 
-                       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 ) {
-                       $copy = Title::newFromText( $wgRightsPage );
+       /**
+        * Set the RequestContext used in this instance
+        *
+        * @param RequestContext $context
+        */
+       public function setContext( RequestContext $context ) {
+               $this->mContext = $context;
+       }
 
-                       if ( $copy ) {
-                               $copyright = $copy->getLocalURL();
-                       }
+       /**
+        * Get the RequestContext used in this instance
+        *
+        * @return RequestContext
+        */
+       public function getContext() {
+               if ( !isset($this->mContext) ) {
+                       wfDebug( __METHOD__ . " called and \$mContext is null. Using RequestContext::getMain(); for sanity\n" );
+                       $this->mContext = RequestContext::getMain();
                }
+               return $this->mContext;
+       }
 
-               if ( !$copyright && $wgRightsUrl ) {
-                       $copyright = $wgRightsUrl;
-               }
+       /** Get the title
+        *
+        * @return Title
+        */
+       public function getTitle() {
+               return $this->getContext()->getTitle();
+       }
 
-               if ( $copyright ) {
-                       $out->addLink( array(
-                               'rel' => 'copyright',
-                               'href' => $copyright )
-                       );
-               }
+       /** Get the user
+        *
+        * @return User
+        */
+       public function getUser() {
+               return $this->getContext()->getUser();
        }
 
        /**
-        * 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->getContext()->getOutput()->getRevisionId();
        }
 
        /**
@@ -346,20 +262,8 @@ abstract class Skin extends Linker {
         * @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 */
-       public function getTitle() {
-               return $this->mTitle;
+               $revID = $this->getRevisionId();
+               return $revID == 0 || $revID == $this->getTitle()->getLatestRevID();
        }
 
        /**
@@ -383,7 +287,7 @@ abstract class Skin extends Linker {
                if ( isset($this->mRelevantTitle) ) {
                        return $this->mRelevantTitle;
                }
-               return $this->mTitle;
+               return $this->getTitle();
        }
 
        /**
@@ -401,6 +305,7 @@ abstract class Skin extends Linker {
         * 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) ) {
@@ -425,40 +330,8 @@ abstract class Skin extends Linker {
        /**
         * Outputs the HTML generated by other functions.
         * @param $out Object: instance of OutputPage
-        * @todo Exterminate!
         */
-       function outputPage( OutputPage $out ) {
-               global $wgDebugComments;
-               wfProfileIn( __METHOD__ );
-
-               $this->setMembers();
-               $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 ) {
@@ -470,49 +343,6 @@ abstract class Skin extends Linker {
                } 
        }
 
-       /**
-        * 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!
-        * 
-        * Do not add things here which can be evaluated in ResourceLoaderStartupScript - in other words, without state.
-        * You will only be adding bloat to the page and causing page caches to have to be purged on configuration changes.
-        */
-       static function makeGlobalVariablesScript( $skinName ) {
-               global $wgTitle, $wgUser, $wgRequest, $wgOut, $wgUseAjax, $wgEnableMWSuggest;
-               
-               $ns = $wgTitle->getNamespace();
-               $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText();
-               $vars = array(
-                       '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(),
-                       'wgCurRevisionId' => $wgTitle->getLatestRevID(),
-                       'wgCategories' => $wgOut->getCategories(),
-                       'wgBreakFrames' => $wgOut->getFrameOptions() == 'DENY',
-               );
-               foreach ( $wgTitle->getRestrictionTypes() as $type ) {
-                       $vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type );
-               }
-               if ( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
-                       $vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $wgUser );
-               }
-               
-               // Allow extensions to add their custom variables to the global JS variables
-               wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
-               
-               return self::makeVariablesScript( $vars );
-       }
-
        /**
         * To make it harder for someone to slip a user a fake
         * user-JavaScript or user-CSS preview, a random token
@@ -524,64 +354,45 @@ abstract class Skin extends Linker {
         * @return bool
         */
        public function userCanPreview( $action ) {
-               global $wgRequest, $wgUser;
-
                if ( $action != 'submit' ) {
                        return false;
                }
-               if ( !$wgRequest->wasPosted() ) {
+               if ( !$this->getContext()->getRequest()->wasPosted() ) {
                        return false;
                }
-               if ( !$this->mTitle->userCanEditCssSubpage() ) {
+               if ( !$this->getTitle()->userCanEditCssSubpage() ) {
                        return false;
                }
-               if ( !$this->mTitle->userCanEditJsSubpage() ) {
+               if ( !$this->getTitle()->userCanEditJsSubpage() ) {
                        return false;
                }
 
-               return $wgUser->matchEditToken(
-                       $wgRequest->getVal( 'wpEditToken' ) );
+               return $this->getContext()->getUser()->matchEditToken(
+                       $this->getContext()->getRequest()->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 '';
        }
 
@@ -589,7 +400,6 @@ abstract class Skin extends Linker {
         * @private
         */
        function setupUserCss( OutputPage $out ) {
-               global $wgRequest;
                global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs;
 
                wfProfileIn( __METHOD__ );
@@ -602,14 +412,17 @@ abstract class Skin extends Linker {
 
                // Per-site custom styles
                if ( $wgUseSiteCss ) {
-                       $out->addModuleStyles( 'site' );
+                       $out->addModuleStyles( array( 'site', 'noscript' ) );
+                       if( $this->getContext()->getUser()->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' ) );
+                       if ( $this->getTitle()->isCssSubpage() && $this->userCanPreview( $this->getContext()->getRequest()->getVal( 'action' ) ) ) {
+                               // @todo FIXME: Properly escape the cdata!
+                               $out->addInlineStyle( $this->getContext()->getRequest()->getText( 'wpTextbox1' ) );
                        } else {
                                $out->addModuleStyles( 'user' );
                        }
@@ -642,18 +455,26 @@ abstract class Skin extends Linker {
 
        /**
         * Add skin specific stylesheets
+        * Calling this method with an $out of anything but the same OutputPage
+        * inside ->getContext()->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 {
@@ -688,10 +509,11 @@ abstract class Skin extends Linker {
        }
 
        function getCategoryLinks() {
-               global $wgOut, $wgUseCategoryBrowser;
-               global $wgContLang, $wgUser;
+               global $wgUseCategoryBrowser, $wgContLang;
 
-               if ( count( $wgOut->mCategoryLinks ) == 0 ) {
+               $out = $this->getContext()->output;
+
+               if ( count( $out->mCategoryLinks ) == 0 ) {
                        return '';
                }
 
@@ -704,7 +526,7 @@ abstract class Skin extends Linker {
                $embed = "<span dir='$dir'>";
                $pop = '</span>';
 
-               $allCats = $wgOut->getCategoryLinks();
+               $allCats = $out->getCategoryLinks();
                $s = '';
                $colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 
@@ -713,15 +535,15 @@ abstract class Skin extends Linker {
 
                        $msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
                        $s .= '<div id="mw-normal-catlinks">' .
-                               $this->link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
+                               Linker::link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
                                . $colon . $t . '</div>';
                }
 
                # Hidden categories
                if ( isset( $allCats['hidden'] ) ) {
-                       if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
+                       if ( $this->getContext()->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';
@@ -739,7 +561,7 @@ abstract class Skin extends Linker {
                        $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 ) );
@@ -756,10 +578,9 @@ abstract class Skin extends Linker {
        /**
         * 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 ) {
@@ -768,28 +589,28 @@ abstract class Skin extends Linker {
                                $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, $eltitle->getText() );
                }
 
                return $return;
        }
 
        function getCategories() {
+               $out = $this->getContext()->output;
+
                $catlinks = $this->getCategoryLinks();
 
                $classes = 'catlinks';
 
-               global $wgOut, $wgUser;
-
                // Check what we're showing
-               $allCats = $wgOut->getCategoryLinks();
-               $showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
-                                               $this->mTitle->getNamespace() == NS_CATEGORY;
+               $allCats = $out->getCategoryLinks();
+               $showHidden = $this->getContext()->getUser()->getBoolOption( 'showhiddencats' ) ||
+                                               $this->getTitle()->getNamespace() == NS_CATEGORY;
 
                if ( empty( $allCats['normal'] ) && !( !empty( $allCats['hidden'] ) && $showHidden ) ) {
                        $classes .= ' catlinks-allhidden';
@@ -839,11 +660,11 @@ abstract class Skin extends Linker {
         * @return String HTML containing debug data, if enabled (otherwise empty).
         */
        protected function generateDebugHTML() {
-               global $wgShowDebug, $wgOut;
+               global $wgShowDebug;
 
                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 = $this->formatDebugHTML( $this->getContext()->getOutput()->mDebugtext );
+                       return "\n<hr />\n<strong>Debug data:</strong><ul id=\"mw-debug-html\">" .
                                $listInternals . "</ul>\n";
                }
 
@@ -851,15 +672,26 @@ abstract class Skin extends Linker {
        }
 
        private function formatDebugHTML( $debugText ) {
+               global $wgDebugTimestamps;
+
                $lines = explode( "\n", $debugText );
                $curIdent = 0;
                $ret = '<li>';
 
                foreach ( $lines as $line ) {
+                       $pre = '';
+                       if ( $wgDebugTimestamps ) {
+                               $matches = array();
+                               if ( preg_match( '/^(\d+\.\d+\s{2})/', $line, $matches ) ) {
+                                       $pre = $matches[1];
+                                       $line = substr( $line, strlen( $pre ) );
+                               }
+                       }
                        $display = ltrim( $line );
                        $ident = strlen( $line ) - strlen( $display );
                        $diff = $ident - $curIdent;
 
+                       $display = $pre . $display;
                        if ( $display == '' ) {
                                $display = "\xc2\xa0";
                        }
@@ -879,7 +711,7 @@ abstract class Skin extends Linker {
                        } else {
                                $ret .= str_repeat( "<ul><li>\n", $diff );
                        }
-                       $ret .= $display . "\n";
+                       $ret .= "<tt>$display</tt>\n";
 
                        $curIdent = $ident;
                }
@@ -895,7 +727,10 @@ abstract class Skin extends Linker {
         * @return String HTML-wrapped JS code to be put before </body>
         */
        function bottomScripts( $out ) {
-               $bottomScriptText = "\n" . $out->getHeadScripts( $this );
+               // 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 = $out->getBottomScripts( $this );
                wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
 
                return $bottomScriptText;
@@ -903,21 +738,19 @@ abstract class Skin extends Linker {
 
        /** @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->getContext()->getRequest()->getVal( 'action', 'view' );
 
-               $action = $wgRequest->getVal( 'action', 'view' );
-
-               if ( $wgUser->isAllowed( 'deletedhistory' ) &&
-                       ( $this->mTitle->getArticleId() == 0 || $action == 'history' ) ) {
-                       $n = $this->mTitle->isDeleted();
+               if ( $this->getContext()->getUser()->isAllowed( 'deletedhistory' ) &&
+                       ( $this->getTitle()->getArticleId() == 0 || $action == 'history' ) ) {
+                       $n = $this->getTitle()->isDeleted();
 
                        if ( $n ) {
-                               if ( $wgUser->isAllowed( 'undelete' ) ) {
+                               if ( $this->getContext()->getUser()->isAllowed( 'undelete' ) ) {
                                        $msg = 'thisisdeleted';
                                } else {
                                        $msg = 'viewdeleted';
@@ -925,9 +758,9 @@ abstract class Skin extends Linker {
 
                                return wfMsg(
                                        $msg,
-                                       $this->link(
-                                               SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
-                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ),
+                                       Linker::link(
+                                               SpecialPage::getTitleFor( 'Undelete', $this->getTitle()->getPrefixedDBkey() ),
+                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $this->getContext()->getLang()->formatNum( $n ) ),
                                                array(),
                                                array(),
                                                array( 'known', 'noclasses' )
@@ -940,16 +773,15 @@ abstract class Skin extends Linker {
        }
 
        function subPageSubtitle() {
+               $out = $this->getContext()->getOutput();
                $subpages = '';
 
-               if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this ) ) ) {
+               if ( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages, $this, $out ) ) ) {
                        return $subpages;
                }
 
-               global $wgOut;
-
-               if ( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
-                       $ptext = $this->mTitle->getPrefixedText();
+               if ( $out->isArticle() && MWNamespace::hasSubpages( $out->getTitle()->getNamespace() ) ) {
+                       $ptext = $this->getTitle()->getPrefixedText();
                        if ( preg_match( '/\//', $ptext ) ) {
                                $links = explode( '/', $ptext );
                                array_pop( $links );
@@ -1010,10 +842,10 @@ abstract class Skin extends Linker {
        }
 
        function getCopyright( $type = 'detect' ) {
-               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText;
 
                if ( $type == 'detect' ) {
-                       $diff = $wgRequest->getVal( 'diff' );
+                       $diff = $this->getContext()->getRequest()->getVal( 'diff' );
 
                        if ( is_null( $diff ) && !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
                                $type = 'history';
@@ -1032,9 +864,9 @@ abstract class Skin extends Linker {
 
                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 {
@@ -1045,7 +877,7 @@ abstract class Skin extends Linker {
                // 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 );
@@ -1102,17 +934,15 @@ abstract class Skin extends Linker {
         * @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->getContext()->getLang()->date( $timestamp, true );
+                       $t = $this->getContext()->getLang()->time( $timestamp, true );
                        $s = ' ' . wfMsg( 'lastmodifiedat', $d, $t );
                } else {
                        $s = '';
@@ -1170,7 +1000,7 @@ abstract class Skin extends Linker {
         * @return string
         */
        function mainPageLink() {
-               $s = $this->link(
+               $s = Linker::link(
                        Title::newMainPage(),
                        wfMsg( 'mainpage' ),
                        array(),
@@ -1192,7 +1022,7 @@ abstract class Skin extends Linker {
                        // 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' ) )
                        );
@@ -1231,16 +1061,15 @@ abstract class Skin extends Linker {
                $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->getContext()->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
        }
 
@@ -1277,7 +1106,7 @@ abstract class Skin extends Linker {
        }
 
        static function makeSpecialUrl( $name, $urlaction = '' ) {
-               $title = SpecialPage::getTitleFor( $name );
+               $title = SpecialPage::getSafeTitleFor( $name );
                return $title->getLocalURL( $urlaction );
        }
 
@@ -1360,10 +1189,9 @@ abstract class Skin extends Linker {
         */
        function buildSidebar() {
                global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
-               global $wgLang;
                wfProfileIn( __METHOD__ );
 
-               $key = wfMemcKey( 'sidebar', $wgLang->getCode() );
+               $key = wfMemcKey( 'sidebar', $this->getContext()->getLang()->getCode() );
 
                if ( $wgEnableSidebarCache ) {
                        $cachedsidebar = $parserMemc->get( $key );
@@ -1394,7 +1222,7 @@ abstract class Skin extends Linker {
         * @param $message String
         */
        function addToSidebar( &$bar, $message ) {
-               $this->addToSidebarPlain( $bar, wfMsgForContent( $message ) );
+               $this->addToSidebarPlain( $bar, wfMsgForContentNoTrans( $message ) );
        }
 
        /**
@@ -1423,23 +1251,26 @@ abstract class Skin extends Linker {
                                $line = trim( $line, '* ' );
 
                                if ( strpos( $line, '|' ) !== false ) { // sanity check
+                                       $line = MessageCache::singleton()->transform( $line, false, null, $this->getTitle() );
                                        $line = array_map( 'trim', explode( '|', $line, 2 ) );
-                                       $link = wfMsgForContent( $line[0] );
 
-                                       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], $text ) ) {
+                                       $msgText = wfMessage( $line[1] );
+                                       if ( $msgText->exists() ) {
+                                               $text = $msgText->text();
+                                       } else {
                                                $text = $line[1];
                                        }
 
-                                       if ( wfEmptyMsg( $line[0], $link ) ) {
-                                               $link = $line[0];
-                                       }
-
                                        if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
                                                $href = $link;
                                        } else {
@@ -1460,14 +1291,14 @@ abstract class Skin extends Linker {
                                                'active' => false
                                        );
                                } else if ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
-                                       global $wgParser, $wgTitle;
+                                       global $wgParser;
 
                                        $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();
+                                       $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $this->getTitle(), $options )->getText();
                                } else {
                                        continue;
                                }
@@ -1498,16 +1329,16 @@ abstract class Skin extends Linker {
         * @return MediaWiki message or if no new talk page messages, nothing
         */
        function getNewtalks() {
-               global $wgUser, $wgOut;
+               $out = $this->getContext()->getOutput();
 
-               $newtalks = $wgUser->getNewMessageLinks();
+               $newtalks = $this->getContext()->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( $this->mTitle ) ) {
+                       if ( !$userTalkTitle->equals( $out->getTitle() ) ) {
                                $newMessagesLink = $this->link(
                                        $userTalkTitle,
                                        wfMsgHtml( 'newmessageslink' ),
@@ -1530,7 +1361,7 @@ abstract class Skin extends Linker {
                                        $newMessagesDiffLink
                                );
                                # Disable Squid cache
-                               $wgOut->setSquidMaxage( 0 );
+                               $out->setSquidMaxage( 0 );
                        }
                } elseif ( count( $newtalks ) ) {
                        // _>" " for BC <= 1.16
@@ -1545,7 +1376,7 @@ abstract class Skin extends Linker {
                        }
                        $parts = implode( $sep, $msgs );
                        $ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
-                       $wgOut->setSquidMaxage( 0 );
+                       $out->setSquidMaxage( 0 );
                }
 
                return $ntl;
@@ -1558,7 +1389,7 @@ abstract class Skin extends Linker {
         * @return String: HTML fragment
         */
        private function getCachedNotice( $name ) {
-               global $wgOut, $wgRenderHashAppend, $parserMemc;
+               global $wgRenderHashAppend, $parserMemc;
 
                wfProfileIn( __METHOD__ );
 
@@ -1595,14 +1426,9 @@ abstract class Skin extends Linker {
                }
 
                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 = '';
-                       }
+                       $parsed = $this->getContext()->getOutput()->parse( $notice );
+                       $parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+                       $notice = $parsed;
                }
 
                $notice = '<div id="localNotice">' .$notice . '</div>';
@@ -1618,15 +1444,15 @@ abstract class Skin extends Linker {
        function getNamespaceNotice() {
                wfProfileIn( __METHOD__ );
 
-               $key = 'namespacenotice-' . $this->mTitle->getNsText();
-               $namespaceNotice = wfGetCachedNotice( $key );
+               $key = 'namespacenotice-' . $this->getTitle()->getNsText();
+               $namespaceNotice = $this->getCachedNotice( $key );
                if ( $namespaceNotice && substr( $namespaceNotice, 0, 7 ) != '<p>&lt;' ) {
                        $namespaceNotice = '<div id="namespacebanner">' . $namespaceNotice . '</div>';
                } else {
                        $namespaceNotice = '';
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $namespaceNotice;
        }
 
@@ -1636,13 +1462,11 @@ abstract class Skin extends Linker {
         * @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->getContext()->getUser() ) && $this->getContext()->getUser()->isLoggedIn() ) {
                                $siteNotice = $this->getCachedNotice( 'sitenotice' );
                        } else {
                                $anonNotice = $this->getCachedNotice( 'anonnotice' );
@@ -1660,5 +1484,78 @@ abstract class Skin extends Linker {
                wfRunHooks( 'SiteNoticeAfter', array( &$siteNotice, $this ) );
                wfProfileOut( __METHOD__ );
                return $siteNotice;
-}
+       }
+
+       /**
+        * Create a section edit link.  This supersedes editSectionLink() and
+        * editSectionLinkForOther().
+        *
+        * @param $nt      Title  The title being linked to (may not be the same as
+        *   $wgTitle, if the section is included from a template)
+        * @param $section string The designation of the section being pointed to,
+        *   to be included in the link, like "&section=$section"
+        * @param $tooltip string The tooltip to use for the link: will be escaped
+        *   and wrapped in the 'editsectionhint' message
+        * @param $lang    string Language code
+        * @return         string HTML to use for edit link
+        */
+       public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) {
+               // HTML generated here should probably have userlangattributes
+               // added to it for LTR text on RTL pages
+               $attribs = array();
+               if ( !is_null( $tooltip ) ) {
+                       # Bug 25462: undo double-escaping.
+                       $tooltip = Sanitizer::decodeCharReferences( $tooltip );
+                       $attribs['title'] = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag' ), $tooltip );
+               }
+               $link = Linker::link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ),
+                       $attribs,
+                       array( 'action' => 'edit', 'section' => $section ),
+                       array( 'noclasses', 'known' )
+               );
+
+               # Run the old hook.  This takes up half of the function . . . hopefully
+               # we can rid of it someday.
+               $attribs = '';
+               if ( $tooltip ) {
+                       $attribs = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'escape' ), $tooltip );
+                       $attribs = " title=\"$attribs\"";
+               }
+               $result = null;
+               wfRunHooks( 'EditSectionLink', array( &$this, $nt, $section, $attribs, $link, &$result, $lang ) );
+               if ( !is_null( $result ) ) {
+                       # For reverse compatibility, add the brackets *after* the hook is
+                       # run, and even add them to hook-provided text.  (This is the main
+                       # reason that the EditSectionLink hook is deprecated in favor of
+                       # DoEditSectionLink: it can't change the brackets or the span.)
+                       $result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $result );
+                       return "<span class=\"editsection\">$result</span>";
+               }
+
+               # Add the brackets and the span, and *then* run the nice new hook, with
+               # clean and non-redundant arguments.
+               $result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $link );
+               $result = "<span class=\"editsection\">$result</span>";
+
+               wfRunHooks( 'DoEditSectionLink', array( $this, $nt, $section, $tooltip, &$result, $lang ) );
+               return $result;
+       }
+
+       /**
+        * Use PHP's magic __call handler to intercept legacy calls to the linker
+        * for backwards compatibility.
+        *
+        * @param $fname String Name of called method
+        * @param $args Array Arguments to the method
+        */
+       function __call( $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" );
+               }
+       }
+
 }