Fixes Bug #28838 — remove CSS references to div.editsection which grep
[lhc/web/wiklou.git] / includes / OutputPage.php
index b953728..82d082a 100644 (file)
@@ -5,16 +5,16 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 /**
  * This class should be covered by a general architecture document which does
- * not exist as of january 2011.  This is one of the Core class and should
+ * not exist as of January 2011.  This is one of the Core classes and should
  * be read at least once by any new developers.
  *
  * This class is used to prepare the final rendering. A skin is then
  * applied to the output parameters (links, javascript, html, categories ...).
- * 
- * Another class (fixme) handle sending the whole page to the client.
- * 
+ *
+ * @todo FIXME: Another class handles sending the whole page to the client.
+ *
  * Some comments comes from a pairing session between Zak Greant and Ashar Voultoiz
- * in november 2010.
+ * in November 2010.
  *
  * @todo document
  */
@@ -37,7 +37,7 @@ class OutputPage {
        var $mBodytext = '';
 
        /**
-        * Holds the debug lines that will be outputted as comments in page source if
+        * Holds the debug lines that will be output as comments in page source if
         * $wgDebugComments is enabled. See also $wgShowDebug.
         * TODO: make a getter method for this
         */
@@ -68,7 +68,7 @@ class OutputPage {
 
        /**
         * mLastModified and mEtag are used for sending cache control.
-        * The whole caching system should probably be moved in its own class.
+        * The whole caching system should probably be moved into its own class.
         */
        var $mLastModified = '';
 
@@ -76,10 +76,10 @@ class OutputPage {
         * Should be private. No getter but used in sendCacheControl();
         * Contains an HTTP Entity Tags (see RFC 2616 section 3.13) which is used
         * as a unique identifier for the content. It is later used by the client
-        * to compare its cache version with the server version. Client sends
-        * headers If-Match and If-None-Match containing its local cache ETAG value.
+        * to compare its cached version with the server version. Client sends
+        * headers If-Match and If-None-Match containing its locally cached ETAG value.
         *
-        * To get more information, you will have to look at HTTP1/1 protocols which
+        * To get more information, you will have to look at HTTP/1.1 protocol which
         * is properly described in RFC 2616 : http://tools.ietf.org/html/rfc2616
         */
        var $mETag = false;
@@ -115,14 +115,19 @@ class OutputPage {
        /// Array of elements in <head>. Parser might add its own headers!
        var $mHeadItems = array();
 
-       // Next variables probably comes from the resource loader @todo FIXME
+       // @todo FIXME: Next variables probably comes from the resource loader
        var $mModules = array(), $mModuleScripts = array(), $mModuleStyles = array(), $mModuleMessages = array();
        var $mResourceLoader;
 
-       /** @fixme is this still used ?*/
+       /** @todo FIXME: Is this still used ?*/
        var $mInlineMsg = array();
 
        var $mTemplateIds = array();
+       var $mImageTimeKeys = array();
+
+    var $mRedirectCode = '';
+
+    var $mFeedLinksAppendQuery = null;
 
        # What level of 'untrustworthiness' is allowed in CSS/JS modules loaded on this page?
        # @see ResourceLoaderModule::$origin
@@ -189,8 +194,9 @@ class OutputPage {
        /// should be private. To include the variable {{REVISIONID}}
        var $mRevisionId = null;
 
-       /// Stores a Title object (of the current page).
-       protected $mTitle = null;
+       var $mFileVersion = null;
+
+       private $mContext;
 
        /**
         * An array of stylesheet filenames (relative from skins path), with options
@@ -214,6 +220,19 @@ class OutputPage {
                'Cookie' => null
        );
 
+       /**
+        * Constructor for OutputPage. This should not be called directly.
+        * Instead a new RequestContext should be created and it will implicitly create
+        * a OutputPage tied to that context.
+        */
+       function __construct( RequestContext $context = null ) {
+               if ( !isset($context) ) {
+                       # Extensions should use `new RequestContext` instead of `new OutputPage` now.
+                       wfDeprecated( __METHOD__ );
+               }
+               $this->mContext = $context;
+       }
+
        /**
         * Redirect to $url rather than displaying the normal page
         *
@@ -285,11 +304,24 @@ class OutputPage {
         *                 "rel" attribute will be automatically added
         */
        function addMetadataLink( $linkarr ) {
+               $linkarr['rel'] = $this->getMetadataAttribute();
+               $this->addLink( $linkarr );
+       }
+
+       /**
+        * Get the value of the "rel" attribute for metadata links
+        *
+        * @return String
+        */
+       public function getMetadataAttribute() {
                # note: buggy CC software only reads first "meta" link
                static $haveMeta = false;
-               $linkarr['rel'] = $haveMeta ? 'alternate meta' : 'meta';
-               $this->addLink( $linkarr );
-               $haveMeta = true;
+               if ( $haveMeta ) {
+                       return 'alternate meta';
+               } else {
+                       $haveMeta = true;
+                       return 'meta';
+               }
        }
 
        /**
@@ -361,16 +393,22 @@ class OutputPage {
        }
 
        /**
-        * Filter an array of modules to remove insufficiently trustworthy members
+        * Filter an array of modules to remove insufficiently trustworthy members, and modules
+        * which are no longer registered (eg a page is cached before an extension is disabled)
         * @param $modules Array
+        * @param $position String if not null, only return modules with this position
+        * @param $type string
         * @return Array
         */
-       protected function filterModules( $modules, $type = ResourceLoaderModule::TYPE_COMBINED ){
+       protected function filterModules( $modules, $position = null, $type = ResourceLoaderModule::TYPE_COMBINED ){
                $resourceLoader = $this->getResourceLoader();
                $filteredModules = array();
                foreach( $modules as $val ){
                        $module = $resourceLoader->getModule( $val );
-                       if( $module->getOrigin() <= $this->getAllowedModules( $type ) ) {
+                       if( $module instanceof ResourceLoaderModule
+                               && $module->getOrigin() <= $this->getAllowedModules( $type )
+                               && ( is_null( $position ) || $module->getPosition() == $position ) )
+                       {
                                $filteredModules[] = $val;
                        }
                }
@@ -381,12 +419,14 @@ class OutputPage {
         * Get the list of modules to include on this page
         *
         * @param $filter Bool whether to filter out insufficiently trustworthy modules
+        * @param $position String if not null, only return modules with this position
+        * @param $param string
         * @return Array of module names
         */
-       public function getModules( $filter = false, $param = 'mModules' ) {
+       public function getModules( $filter = false, $position = null, $param = 'mModules' ) {
                $modules = array_values( array_unique( $this->$param ) );
                return $filter
-                       ? $this->filterModules( $modules )
+                       ? $this->filterModules( $modules, $position )
                        : $modules;
        }
 
@@ -403,10 +443,14 @@ class OutputPage {
 
        /**
         * Get the list of module JS to include on this page
+        *
+        * @param $filter
+        * @param $position
+        *
         * @return array of module names
         */
-       public function getModuleScripts( $filter = false ) {
-               return $this->getModules( $filter, 'mModuleScripts' );
+       public function getModuleScripts( $filter = false, $position = null ) {
+               return $this->getModules( $filter, $position, 'mModuleScripts' );
        }
 
        /**
@@ -423,10 +467,13 @@ class OutputPage {
        /**
         * Get the list of module CSS to include on this page
         *
+        * @param $filter
+        * @param $position
+        * 
         * @return Array of module names
         */
-       public function getModuleStyles( $filter = false ) {
-               return $this->getModules( $filter, 'mModuleStyles' );
+       public function getModuleStyles( $filter = false, $position = null ) {
+               return $this->getModules( $filter,  $position, 'mModuleStyles' );
        }
 
        /**
@@ -443,10 +490,13 @@ class OutputPage {
        /**
         * Get the list of module messages to include on this page
         *
+        * @param $filter
+        * @param $position
+        *
         * @return Array of module names
         */
-       public function getModuleMessages( $filter = false ) {
-               return $this->getModules( $filter, 'mModuleMessages' );
+       public function getModuleMessages( $filter = false, $position = null ) {
+               return $this->getModules( $filter, $position, 'mModuleMessages' );
        }
 
        /**
@@ -529,10 +579,12 @@ class OutputPage {
         *
         * Side effect: sets mLastModified for Last-Modified header
         *
+        * @param $timestamp string
+        *
         * @return Boolean: true iff cache-ok headers was sent.
         */
        public function checkLastModified( $timestamp ) {
-               global $wgCachePages, $wgCacheEpoch, $wgUser, $wgRequest;
+               global $wgCachePages, $wgCacheEpoch;
 
                if ( !$timestamp || $timestamp == '19700101000000' ) {
                        wfDebug( __METHOD__ . ": CACHE DISABLED, NO TIMESTAMP\n" );
@@ -542,7 +594,7 @@ class OutputPage {
                        wfDebug( __METHOD__ . ": CACHE DISABLED\n", false );
                        return false;
                }
-               if( $wgUser->getOption( 'nocache' ) ) {
+               if( $this->getUser()->getOption( 'nocache' ) ) {
                        wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false );
                        return false;
                }
@@ -550,7 +602,7 @@ class OutputPage {
                $timestamp = wfTimestamp( TS_MW, $timestamp );
                $modifiedTimes = array(
                        'page' => $timestamp,
-                       'user' => $wgUser->getTouched(),
+                       'user' => $this->getUser()->getTouched(),
                        'epoch' => $wgCacheEpoch
                );
                wfRunHooks( 'OutputPageCheckLastModified', array( &$modifiedTimes ) );
@@ -599,7 +651,7 @@ class OutputPage {
                # Give a 304 response code and disable body output
                wfDebug( __METHOD__ . ": NOT MODIFIED, $info\n", false );
                ini_set( 'zlib.output_compression', 0 );
-               $wgRequest->response()->header( "HTTP/1.1 304 Not Modified" );
+               $this->getRequest()->response()->header( "HTTP/1.1 304 Not Modified" );
                $this->sendCacheControl();
                $this->disable();
 
@@ -692,6 +744,8 @@ class OutputPage {
        /**
         * "HTML title" means the contents of <title>.
         * It is stored as plain, unescaped text and will be run through htmlspecialchars in the skin file.
+        *
+        * @param $name string
         */
        public function setHTMLTitle( $name ) {
                $this->mHTMLtitle = $name;
@@ -711,6 +765,8 @@ class OutputPage {
         * This function allows good tags like \<sup\> in the \<h1\> tag, but not bad tags like \<script\>.
         * This function automatically sets \<title\> to the same content as \<h1\> but with all tags removed.
         * Bad tags that were escaped in \<h1\> will still be escaped in \<title\>, and good tags like \<i\> will be dropped entirely.
+        *
+        * @param $name string
         */
        public function setPageTitle( $name ) {
                # change "<script>foo&bar</script>" to "&lt;script&gt;foo&amp;bar&lt;/script&gt;"
@@ -731,13 +787,36 @@ class OutputPage {
                return $this->mPagetitle;
        }
 
+       /**
+        * Get the RequestContext used in this instance
+        *
+        * @return RequestContext
+        */
+       private 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;
+       }
+
+       /**
+        * Get the WebRequest being used for this instance
+        *
+        * @return WebRequest
+        * @since 1.18
+        */
+       public function getRequest() {
+               return $this->getContext()->getRequest();
+       }
+
        /**
         * Set the Title object to use
         *
         * @param $t Title object
         */
        public function setTitle( $t ) {
-               $this->mTitle = $t;
+               $this->getContext()->setTitle( $t );
        }
 
        /**
@@ -746,13 +825,27 @@ class OutputPage {
         * @return Title
         */
        public function getTitle() {
-               if ( $this->mTitle instanceof Title ) {
-                       return $this->mTitle;
-               } else {
-                       wfDebug( __METHOD__ . " called and \$mTitle is null. Return \$wgTitle for sanity\n" );
-                       global $wgTitle;
-                       return $wgTitle;
-               }
+               return $this->getContext()->getTitle();
+       }
+
+       /**
+        * Get the User object used in this instance
+        *
+        * @return User
+        * @since 1.18
+        */
+       public function getUser() {
+               return $this->getContext()->getUser();
+       }
+
+       /**
+        * Get the Skin object used to render this instance
+        *
+        * @return Skin
+        * @since 1.18
+        */
+       public function getSkin() {
+               return $this->getContext()->getSkin();
        }
 
        /**
@@ -992,7 +1085,7 @@ class OutputPage {
         * @param $categories Array mapping category name => sort key
         */
        public function addCategoryLinks( $categories ) {
-               global $wgUser, $wgContLang;
+               global $wgContLang;
 
                if ( !is_array( $categories ) || count( $categories ) == 0 ) {
                        return;
@@ -1031,7 +1124,6 @@ class OutputPage {
 
                # Add the remaining categories to the skin
                if ( wfRunHooks( 'OutputPageMakeCategoryLinks', array( &$this, $categories, &$this->mCategoryLinks ) ) ) {
-                       $sk = $wgUser->getSkin();
                        foreach ( $categories as $category => $type ) {
                                $origcategory = $category;
                                $title = Title::makeTitleSafe( NS_CATEGORY, $category );
@@ -1043,7 +1135,7 @@ class OutputPage {
                                }
                                $text = $wgContLang->convertHtml( $title->getText() );
                                $this->mCategories[] = $title->getText();
-                               $this->mCategoryLinks[$type][] = $sk->link( $title, $text );
+                               $this->mCategoryLinks[$type][] = Linker::link( $title, $text );
                        }
                }
        }
@@ -1092,8 +1184,8 @@ class OutputPage {
 
        /**
         * Return whether user JavaScript is allowed for this page
-        * @deprecated @since 1.18 Load modules with ResourceLoader, and origin and
-        *     trustworthiness is identified and enforced automagically. 
+        * @deprecated since 1.18 Load modules with ResourceLoader, and origin and
+        *     trustworthiness is identified and enforced automagically.
         * @return Boolean
         */
        public function isUserJsAllowed() {
@@ -1204,7 +1296,7 @@ class OutputPage {
        }
 
        /**
-        * Get the current revision ID
+        * Get the displayed revision ID
         *
         * @return Integer
         */
@@ -1212,6 +1304,49 @@ class OutputPage {
                return $this->mRevisionId;
        }
 
+       /**
+        * Set the displayed file version
+        *
+        * @param $file File|false
+        * @return Mixed: previous value
+        */
+       public function setFileVersion( $file ) {
+               $val = null;
+               if ( $file instanceof File && $file->exists() ) {
+                       $val = array( 'time' => $file->getTimestamp(), 'sha1' => $file->getSha1() );
+               }
+               return wfSetVar( $this->mFileVersion, $val, true );
+       }
+
+       /**
+        * Get the displayed file version
+        *
+        * @return Array|null ('time' => MW timestamp, 'sha1' => sha1)
+        */
+       public function getFileVersion() {
+               return $this->mFileVersion;
+       }
+
+       /**
+        * Get the templates used on this page
+        *
+        * @return Array (namespace => dbKey => revId)
+        * @since 1.18
+        */
+       public function getTemplateIds() {
+               return $this->mTemplateIds;
+       }
+
+       /**
+        * Get the files used on this page
+        *
+        * @return Array (dbKey => array('time' => MW timestamp or null, 'sha1' => sha1 or ''))
+        * @since 1.18
+        */
+       public function getImageTimeKeys() {
+               return $this->mImageTimeKeys;
+       }
+
        /**
         * Convert wikitext to HTML and add it to the buffer
         * Default assumes that the current page title will be used.
@@ -1305,14 +1440,19 @@ class OutputPage {
                $this->mNoGallery = $parserOutput->getNoGallery();
                $this->mHeadItems = array_merge( $this->mHeadItems, $parserOutput->getHeadItems() );
                $this->addModules( $parserOutput->getModules() );
-               // Versioning...
-               foreach ( (array)$parserOutput->mTemplateIds as $ns => $dbks ) {
+
+               // Template versioning...
+               foreach ( (array)$parserOutput->getTemplateIds() as $ns => $dbks ) {
                        if ( isset( $this->mTemplateIds[$ns] ) ) {
                                $this->mTemplateIds[$ns] = $dbks + $this->mTemplateIds[$ns];
                        } else {
                                $this->mTemplateIds[$ns] = $dbks;
                        }
                }
+               // File versioning...
+               foreach ( (array)$parserOutput->getImageTimeKeys() as $dbk => $data ) {
+                       $this->mImageTimeKeys[$dbk] = $data;
+               }
 
                // Hooks registered in the object
                global $wgParserOutputHooks;
@@ -1433,7 +1573,9 @@ class OutputPage {
        /**
         * Use enableClientCache(false) to force it to send nocache headers
         *
-        * @param $state ??
+        * @param $state bool
+        *
+        * @return bool
         */
        public function enableClientCache( $state ) {
                return wfSetVar( $this->mEnableClientCache, $state );
@@ -1468,9 +1610,9 @@ class OutputPage {
         * @return Boolean
         */
        function uncacheableBecauseRequestVars() {
-               global $wgRequest;
-               return $wgRequest->getText( 'useskin', false ) === false
-                       && $wgRequest->getText( 'uselang', false ) === false;
+               $request = $this->getRequest();
+               return $request->getText( 'useskin', false ) === false
+                       && $request->getText( 'uselang', false ) === false;
        }
 
        /**
@@ -1480,8 +1622,7 @@ class OutputPage {
         * @return Boolean
         */
        function haveCacheVaryCookies() {
-               global $wgRequest;
-               $cookieHeader = $wgRequest->getHeader( 'cookie' );
+               $cookieHeader = $this->getRequest()->getHeader( 'cookie' );
                if ( $cookieHeader === false ) {
                        return false;
                }
@@ -1502,7 +1643,7 @@ class OutputPage {
         *
         * @param $header String: header name
         * @param $option Array|null
-        * @fixme Document the $option parameter; it appears to be for
+        * @todo FIXME: Document the $option parameter; it appears to be for
         *        X-Vary-Options but what format is acceptable?
         */
        public function addVaryHeader( $header, $option = null ) {
@@ -1554,8 +1695,8 @@ class OutputPage {
         *   /w/index.php?title=Main_page&variant=zh-cn should never be served.
         */
        function addAcceptLanguage() {
-               global $wgRequest, $wgContLang;
-               if( !$wgRequest->getCheck( 'variant' ) && $wgContLang->hasVariants() ) {
+               global $wgContLang;
+               if( !$this->getRequest()->getCheck( 'variant' ) && $wgContLang->hasVariants() ) {
                        $variants = $wgContLang->getVariants();
                        $aloption = array();
                        foreach ( $variants as $variant ) {
@@ -1580,12 +1721,14 @@ class OutputPage {
        }
 
        /**
-        * Set a flag which will cause an X-Frame-Options header appropriate for 
-        * edit pages to be sent. The header value is controlled by 
+        * Set a flag which will cause an X-Frame-Options header appropriate for
+        * edit pages to be sent. The header value is controlled by
         * $wgEditPageFrameOptions.
         *
-        * This is the default for special pages. If you display a CSRF-protected 
+        * This is the default for special pages. If you display a CSRF-protected
         * form on an ordinary view page, then you need to call this function.
+        *
+        * @param $enable bool
         */
        public function preventClickjacking( $enable = true ) {
                $this->mPreventClickjacking = $enable;
@@ -1601,9 +1744,11 @@ class OutputPage {
        }
 
        /**
-        * Get the X-Frame-Options header value (without the name part), or false 
-        * if there isn't one. This is used by Skin to determine whether to enable 
+        * Get the X-Frame-Options header value (without the name part), or false
+        * if there isn't one. This is used by Skin to determine whether to enable
         * JavaScript frame-breaking, for clients that don't support X-Frame-Options.
+        *
+        * @return string
         */
        public function getFrameOptions() {
                global $wgBreakFrames, $wgEditPageFrameOptions;
@@ -1618,9 +1763,9 @@ class OutputPage {
         * Send cache control HTTP headers
         */
        public function sendCacheControl() {
-               global $wgUseSquid, $wgUseESI, $wgUseETag, $wgSquidMaxage, $wgRequest, $wgUseXVO;
+               global $wgUseSquid, $wgUseESI, $wgUseETag, $wgSquidMaxage, $wgUseXVO;
 
-               $response = $wgRequest->response();
+               $response = $this->getRequest()->response();
                if ( $wgUseETag && $this->mETag ) {
                        $response->header( "ETag: $this->mETag" );
                }
@@ -1687,58 +1832,13 @@ class OutputPage {
         *
         * @param $code Integer: status code
         * @return String or null: message or null if $code is not in the list of
-        *         messages
+        *         messages 
+        *
+        * @deprecated since 1.19 Use HttpStatus::getMessage() instead.
         */
        public static function getStatusMessage( $code ) {
-               static $statusMessage = array(
-                       100 => 'Continue',
-                       101 => 'Switching Protocols',
-                       102 => 'Processing',
-                       200 => 'OK',
-                       201 => 'Created',
-                       202 => 'Accepted',
-                       203 => 'Non-Authoritative Information',
-                       204 => 'No Content',
-                       205 => 'Reset Content',
-                       206 => 'Partial Content',
-                       207 => 'Multi-Status',
-                       300 => 'Multiple Choices',
-                       301 => 'Moved Permanently',
-                       302 => 'Found',
-                       303 => 'See Other',
-                       304 => 'Not Modified',
-                       305 => 'Use Proxy',
-                       307 => 'Temporary Redirect',
-                       400 => 'Bad Request',
-                       401 => 'Unauthorized',
-                       402 => 'Payment Required',
-                       403 => 'Forbidden',
-                       404 => 'Not Found',
-                       405 => 'Method Not Allowed',
-                       406 => 'Not Acceptable',
-                       407 => 'Proxy Authentication Required',
-                       408 => 'Request Timeout',
-                       409 => 'Conflict',
-                       410 => 'Gone',
-                       411 => 'Length Required',
-                       412 => 'Precondition Failed',
-                       413 => 'Request Entity Too Large',
-                       414 => 'Request-URI Too Large',
-                       415 => 'Unsupported Media Type',
-                       416 => 'Request Range Not Satisfiable',
-                       417 => 'Expectation Failed',
-                       422 => 'Unprocessable Entity',
-                       423 => 'Locked',
-                       424 => 'Failed Dependency',
-                       500 => 'Internal Server Error',
-                       501 => 'Not Implemented',
-                       502 => 'Bad Gateway',
-                       503 => 'Service Unavailable',
-                       504 => 'Gateway Timeout',
-                       505 => 'HTTP Version Not Supported',
-                       507 => 'Insufficient Storage'
-               );
-               return isset( $statusMessage[$code] ) ? $statusMessage[$code] : null;
+               wfDeprecated( __METHOD__ );
+               return HttpStatus::getMessage( $code );
        }
 
        /**
@@ -1746,109 +1846,65 @@ class OutputPage {
         * the object, let's actually output it:
         */
        public function output() {
-               global $wgUser, $wgOutputEncoding, $wgRequest;
                global $wgLanguageCode, $wgDebugRedirects, $wgMimeType;
-               global $wgUseAjax, $wgAjaxWatch;
-               global $wgEnableMWSuggest, $wgUniversalEditButton;
 
                if( $this->mDoNothing ) {
                        return;
                }
+
                wfProfileIn( __METHOD__ );
+
+               $response = $this->getRequest()->response();
+
                if ( $this->mRedirect != '' ) {
                        # Standards require redirect URLs to be absolute
                        $this->mRedirect = wfExpandUrl( $this->mRedirect );
                        if( $this->mRedirectCode == '301' || $this->mRedirectCode == '303' ) {
                                if( !$wgDebugRedirects ) {
-                                       $message = self::getStatusMessage( $this->mRedirectCode );
-                                       $wgRequest->response()->header( "HTTP/1.1 {$this->mRedirectCode} $message" );
+                                       $message = HttpStatus::getMessage( $this->mRedirectCode );
+                                       $response->header( "HTTP/1.1 {$this->mRedirectCode} $message" );
                                }
                                $this->mLastModified = wfTimestamp( TS_RFC2822 );
                        }
                        $this->sendCacheControl();
 
-                       $wgRequest->response()->header( "Content-Type: text/html; charset=utf-8" );
+                       $response->header( "Content-Type: text/html; charset=utf-8" );
                        if( $wgDebugRedirects ) {
                                $url = htmlspecialchars( $this->mRedirect );
                                print "<html>\n<head>\n<title>Redirect</title>\n</head>\n<body>\n";
                                print "<p>Location: <a href=\"$url\">$url</a></p>\n";
                                print "</body>\n</html>\n";
                        } else {
-                               $wgRequest->response()->header( 'Location: ' . $this->mRedirect );
+                               $response->header( 'Location: ' . $this->mRedirect );
                        }
                        wfProfileOut( __METHOD__ );
                        return;
                } elseif ( $this->mStatusCode ) {
-                       $message = self::getStatusMessage( $this->mStatusCode );
+                       $message = HttpStatus::getMessage( $this->mStatusCode );
                        if ( $message ) {
-                               $wgRequest->response()->header( 'HTTP/1.1 ' . $this->mStatusCode . ' ' . $message );
-                       }
-               }
-
-               $sk = $wgUser->getSkin();
-
-               // Add base resources
-               $this->addModules( 'mediawiki.util' );
-               global $wgIncludeLegacyJavaScript;
-               if( $wgIncludeLegacyJavaScript ){
-                       $this->addModules( 'mediawiki.legacy.wikibits' );
-               }
-
-               // Add various resources if required
-               if ( $wgUseAjax ) {
-                       $this->addModules( 'mediawiki.legacy.ajax' );
-
-                       wfRunHooks( 'AjaxAddScript', array( &$this ) );
-
-                       if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
-                               $this->addModules( 'mediawiki.action.watch.ajax' );
-                       }
-
-                       if ( $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
-                               $this->addModules( 'mediawiki.legacy.mwsuggest' );
+                               $response->header( 'HTTP/1.1 ' . $this->mStatusCode . ' ' . $message );
                        }
                }
 
-               if( $wgUser->getBoolOption( 'editsectiononrightclick' ) ) {
-                       $this->addModules( 'mediawiki.action.view.rightClickEdit' );
-               }
-
-               if( $wgUniversalEditButton ) {
-                       if( $this->isArticleRelated() && $this->getTitle() && $this->getTitle()->quickUserCan( 'edit' )
-                               && ( $this->getTitle()->exists() || $this->getTitle()->quickUserCan( 'create' ) ) ) {
-                               // Original UniversalEditButton
-                               $msg = wfMsg( 'edit' );
-                               $this->addLink( array(
-                                       'rel' => 'alternate',
-                                       'type' => 'application/x-wiki',
-                                       'title' => $msg,
-                                       'href' => $this->getTitle()->getLocalURL( 'action=edit' )
-                               ) );
-                               // Alternate edit link
-                               $this->addLink( array(
-                                       'rel' => 'edit',
-                                       'title' => $msg,
-                                       'href' => $this->getTitle()->getLocalURL( 'action=edit' )
-                               ) );
-                       }
-               }
-
-
                # Buffer output; final headers may depend on later processing
                ob_start();
 
-               $wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
-               $wgRequest->response()->header( 'Content-language: ' . $wgLanguageCode );
+               $response->header( "Content-type: $wgMimeType; charset=UTF-8" );
+               $response->header( 'Content-language: ' . $wgLanguageCode );
 
                // Prevent framing, if requested
                $frameOptions = $this->getFrameOptions();
                if ( $frameOptions ) {
-                       $wgRequest->response()->header( "X-Frame-Options: $frameOptions" );
+                       $response->header( "X-Frame-Options: $frameOptions" );
                }
 
                if ( $this->mArticleBodyOnly ) {
                        $this->out( $this->mBodytext );
                } else {
+                       $this->addDefaultModules();
+
+                       $sk = $this->getSkin();
+
                        // Hook that allows last minute changes to the output page, e.g.
                        // adding of CSS or Javascript by extensions.
                        wfRunHooks( 'BeforePageDisplay', array( &$this, &$sk ) );
@@ -1864,93 +1920,20 @@ class OutputPage {
        }
 
        /**
-        * Actually output something with print(). Performs an iconv to the
-        * output encoding, if needed.
+        * Actually output something with print().
         *
         * @param $ins String: the string to output
         */
        public function out( $ins ) {
-               global $wgInputEncoding, $wgOutputEncoding, $wgContLang;
-               if ( 0 == strcmp( $wgInputEncoding, $wgOutputEncoding ) ) {
-                       $outs = $ins;
-               } else {
-                       $outs = $wgContLang->iconv( $wgInputEncoding, $wgOutputEncoding, $ins );
-                       if ( false === $outs ) {
-                               $outs = $ins;
-                       }
-               }
-               print $outs;
+               print $ins;
        }
 
        /**
         * Produce a "user is blocked" page.
-        *
-        * @param $return Boolean: whether to have a "return to $wgTitle" message or not.
-        * @return nothing
+        * @deprecated since 1.18
         */
-       function blockedPage( $return = true ) {
-               global $wgUser, $wgContLang, $wgLang;
-
-               $this->setPageTitle( wfMsg( 'blockedtitle' ) );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-
-               $name = User::whoIs( $wgUser->blockedBy() );
-               $reason = $wgUser->blockedFor();
-               if( $reason == '' ) {
-                       $reason = wfMsg( 'blockednoreason' );
-               }
-               $blockTimestamp = $wgLang->timeanddate(
-                       wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true
-               );
-               $ip = wfGetIP();
-
-               $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]";
-
-               $blockid = $wgUser->mBlock->mId;
-
-               $blockExpiry = $wgUser->mBlock->mExpiry;
-               if ( $blockExpiry == 'infinity' ) {
-                       // Entry in database (table ipblocks) is 'infinity' but 'ipboptions' uses 'infinite' or 'indefinite'
-                       // Search for localization in 'ipboptions'
-                       $scBlockExpiryOptions = wfMsg( 'ipboptions' );
-                       foreach ( explode( ',', $scBlockExpiryOptions ) as $option ) {
-                               if ( strpos( $option, ':' ) === false ) {
-                                       continue;
-                               }
-                               list( $show, $value ) = explode( ':', $option );
-                               if ( $value == 'infinite' || $value == 'indefinite' ) {
-                                       $blockExpiry = $show;
-                                       break;
-                               }
-                       }
-               } else {
-                       $blockExpiry = $wgLang->timeanddate(
-                               wfTimestamp( TS_MW, $blockExpiry ),
-                               true
-                       );
-               }
-
-               if ( $wgUser->mBlock->mAuto ) {
-                       $msg = 'autoblockedtext';
-               } else {
-                       $msg = 'blockedtext';
-               }
-
-               /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked.
-                * This could be a username, an IP range, or a single IP. */
-               $intended = $wgUser->mBlock->mAddress;
-
-               $this->addWikiMsg(
-                       $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry,
-                       $intended, $blockTimestamp
-               );
-
-               # Don't auto-return to special pages
-               if( $return ) {
-                       $return = $this->getTitle()->getNamespace() > -1 ? $this->getTitle() : null;
-                       $this->returnToMain( null, $return );
-               }
+       function blockedPage() {
+               throw new UserBlockedError( $this->getUser()->mBlock );
        }
 
        /**
@@ -2015,52 +1998,28 @@ class OutputPage {
 
        /**
         * Display an error page noting that a given permission bit is required.
-        *
+        * @deprecated since 1.18, just throw the exception directly
         * @param $permission String: key required
         */
        public function permissionRequired( $permission ) {
-               global $wgLang;
-
-               $this->setPageTitle( wfMsg( 'badaccess' ) );
-               $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
-               $this->setRobotPolicy( 'noindex,nofollow' );
-               $this->setArticleRelated( false );
-               $this->mBodytext = '';
-
-               $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
-                       User::getGroupsWithPermission( $permission ) );
-               if( $groups ) {
-                       $this->addWikiMsg(
-                               'badaccess-groups',
-                               $wgLang->commaList( $groups ),
-                               count( $groups )
-                       );
-               } else {
-                       $this->addWikiMsg( 'badaccess-group0' );
-               }
-               $this->returnToMain();
+               throw new PermissionsError( $permission );
        }
 
        /**
         * Produce the stock "please login to use the wiki" page
         */
        public function loginToUse() {
-               global $wgUser;
-
-               if( $wgUser->isLoggedIn() ) {
-                       $this->permissionRequired( 'read' );
-                       return;
+               if( $this->getUser()->isLoggedIn() ) {
+                       throw new PermissionsError( 'read' );
                }
 
-               $skin = $wgUser->getSkin();
-
                $this->setPageTitle( wfMsg( 'loginreqtitle' ) );
                $this->setHtmlTitle( wfMsg( 'errorpagetitle' ) );
                $this->setRobotPolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
 
                $loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
-               $loginLink = $skin->link(
+               $loginLink = Linker::link(
                        $loginTitle,
                        wfMsgHtml( 'loginreqlink' ),
                        array(),
@@ -2136,9 +2095,6 @@ class OutputPage {
         * @param $action    String: action that was denied or null if unknown
         */
        public function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) {
-               global $wgUser;
-               $skin = $wgUser->getSkin();
-
                $this->setRobotPolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
 
@@ -2153,7 +2109,7 @@ class OutputPage {
                        if( $source ) {
                                $this->setPageTitle( wfMsg( 'viewsource' ) );
                                $this->setSubtitle(
-                                       wfMsg( 'viewsourcefor', $skin->linkKnown( $this->getTitle() ) )
+                                       wfMsg( 'viewsourcefor', Linker::linkKnown( $this->getTitle() ) )
                                );
                        } else {
                                $this->setPageTitle( wfMsg( 'badaccess' ) );
@@ -2161,9 +2117,7 @@ class OutputPage {
                        $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons, $action ) );
                } else {
                        // Wiki is read only
-                       $this->setPageTitle( wfMsg( 'readonly' ) );
-                       $reason = wfReadOnlyReason();
-                       $this->wrapWikiMsg( "<div class='mw-readonly-error'>\n$1\n</div>", array( 'readonlytext', $reason ) );
+                       throw new ReadOnlyError;
                }
 
                // Show source, if supplied
@@ -2173,17 +2127,17 @@ class OutputPage {
                        $params = array(
                                'id'   => 'wpTextbox1',
                                'name' => 'wpTextbox1',
-                               'cols' => $wgUser->getOption( 'cols' ),
-                               'rows' => $wgUser->getOption( 'rows' ),
+                               'cols' => $this->getUser()->getOption( 'cols' ),
+                               'rows' => $this->getUser()->getOption( 'rows' ),
                                'readonly' => 'readonly'
                        );
                        $this->addHTML( Html::element( 'textarea', $params, $source ) );
 
                        // Show templates used by this article
-                       $skin = $wgUser->getSkin();
                        $article = new Article( $this->getTitle() );
+                       $templates = Linker::formatTemplates( $article->getUsedTemplates() );
                        $this->addHTML( "<div class='templatesUsed'>
-{$skin->formatTemplates( $article->getUsedTemplates() )}
+$templates
 </div>
 " );
                }
@@ -2197,24 +2151,31 @@ class OutputPage {
        }
 
        /**
-        * Adds JS-based password security checker
-        * @param $passwordId String ID of input box containing password
-        * @param $retypeId String ID of input box containing retyped password
-        * @return none
+        * Turn off regular page output and return an error reponse
+        * for when rate limiting has triggered.
         */
-       public function addPasswordSecurity( $passwordId, $retypeId ) {
-               $data = array(
-                       'password' => '#' . $passwordId,
-                       'retype' => '#' . $retypeId,
-                       'messages' => array(),
-               );
-               foreach ( array( 'password-strength', 'password-strength-bad', 'password-strength-mediocre',
-                               'password-strength-acceptable', 'password-strength-good', 'password-retype', 'password-retype-mismatch'
-                       ) as $message ) {
-                       $data['messages'][$message] = wfMsg( $message );
+       public function rateLimited() {
+               throw new ThrottledError;
+       }
+
+       /**
+        * Show a warning about slave lag
+        *
+        * If the lag is higher than $wgSlaveLagCritical seconds,
+        * then the warning is a bit more obvious. If the lag is
+        * lower than $wgSlaveLagWarning, then no warning is shown.
+        *
+        * @param $lag Integer: slave lag
+        */
+       public function showLagWarning( $lag ) {
+               global $wgSlaveLagWarning, $wgSlaveLagCritical;
+               if( $lag >= $wgSlaveLagWarning ) {
+                       $message = $lag < $wgSlaveLagCritical
+                               ? 'lag-warn-normal'
+                               : 'lag-warn-high';
+                       $wrap = Html::rawElement( 'div', array( 'class' => "mw-{$message}" ), "\n$1\n" );
+                       $this->wrapWikiMsg( "$wrap\n", array( $message, $this->getContext()->getLang()->formatNum( $lag ) ) );
                }
-               $this->addScript( Html::inlineScript( 'var passwordSecurity=' . FormatJson::encode( $data ) ) );
-               $this->addModules( 'mediawiki.legacy.password' );
        }
 
        public function showFatalError( $message ) {
@@ -2250,15 +2211,14 @@ class OutputPage {
         * Add a "return to" link pointing to a specified title
         *
         * @param $title Title to link
-        * @param $query String: query string
+        * @param $query String query string
         * @param $text String text of the link (input is not escaped)
         */
        public function addReturnTo( $title, $query = array(), $text = null ) {
-               global $wgUser;
                $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullURL() ) );
                $link = wfMsgHtml(
                        'returnto',
-                       $wgUser->getSkin()->link( $title, $text, array(), $query )
+                       Linker::link( $title, $text, array(), $query )
                );
                $this->addHTML( "<p id=\"mw-returnto\">{$link}</p>\n" );
        }
@@ -2272,14 +2232,12 @@ class OutputPage {
         * @param $returntoquery String: query string for the return to link
         */
        public function returnToMain( $unused = null, $returnto = null, $returntoquery = null ) {
-               global $wgRequest;
-
                if ( $returnto == null ) {
-                       $returnto = $wgRequest->getText( 'returnto' );
+                       $returnto = $this->getRequest()->getText( 'returnto' );
                }
 
                if ( $returntoquery == null ) {
-                       $returntoquery = $wgRequest->getText( 'returntoquery' );
+                       $returntoquery = $this->getRequest()->getText( 'returntoquery' );
                }
 
                if ( $returnto === '' ) {
@@ -2304,17 +2262,14 @@ class OutputPage {
         * @return String: The doctype, opening <html>, and head element.
         */
        public function headElement( Skin $sk, $includeStyle = true ) {
-               global $wgOutputEncoding, $wgMimeType;
-               global $wgUseTrackbacks, $wgHtml5;
-               global $wgUser, $wgRequest, $wgLang;
+               global $wgUseTrackbacks, $wgLang;
 
                if ( $sk->commonPrintStylesheet() ) {
                        $this->addModuleStyles( 'mediawiki.legacy.wikiprintable' );
                }
                $sk->setupUserCss( $this );
 
-               $lang = wfUILang();
-               $ret = Html::htmlHeader( array( 'lang' => $lang->getCode(), 'dir' => $lang->getDir() ) );
+               $ret = Html::htmlHeader( array( 'lang' => $wgLang->getCode(), 'dir' => $wgLang->getDir() ) );
 
                if ( $this->getHTMLTitle() == '' ) {
                        $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() ) );
@@ -2326,19 +2281,12 @@ class OutputPage {
                        $ret .= "$openHead\n";
                }
 
-               if ( $wgHtml5 ) {
-                       # More succinct than <meta http-equiv=Content-Type>, has the
-                       # same effect
-                       $ret .= Html::element( 'meta', array( 'charset' => $wgOutputEncoding ) ) . "\n";
-               } else {
-                       $this->addMeta( 'http:Content-Type', "$wgMimeType; charset=$wgOutputEncoding" );
-               }
-
                $ret .= Html::element( 'title', null, $this->getHTMLTitle() ) . "\n";
 
                $ret .= implode( "\n", array(
-                       $this->getHeadLinks( $sk ),
+                       $this->getHeadLinks( $sk, true ),
                        $this->buildCssLinks( $sk ),
+                       $this->getHeadScripts( $sk ),
                        $this->getHeadItems()
                ) );
 
@@ -2354,22 +2302,26 @@ class OutputPage {
                $bodyAttrs = array();
 
                # Crazy edit-on-double-click stuff
-               $action = $wgRequest->getVal( 'action', 'view' );
+               $action = $this->getRequest()->getVal( 'action', 'view' );
 
                if (
                        $this->getTitle()->getNamespace() != NS_SPECIAL &&
-                       !in_array( $action, array( 'edit', 'submit' ) ) &&
-                       $wgUser->getOption( 'editondblclick' )
+                       in_array( $action, array( 'view', 'purge' ) ) &&
+                       $this->getUser()->getOption( 'editondblclick' )
                )
                {
-                       $bodyAttrs['ondblclick'] = "document.location = '" . Xml::escapeJsString( $this->getTitle()->getEditURL() ) . "'";
+                       $editUrl = $this->getTitle()->getLocalUrl( $sk->editUrlOptions() );
+                       $bodyAttrs['ondblclick'] = "document.location = '" .
+                               Xml::escapeJsString( $editUrl ) . "'";
                }
 
-               # Class bloat
-               $dir = wfUILang()->getDir();
-               $bodyAttrs['class'] = "mediawiki $dir";
+               # Classes for LTR/RTL directionality support
+               global $wgLang, $wgContLang;
+               $userdir = $wgLang->getDir();
+               $sitedir = $wgContLang->getDir();
+               $bodyAttrs['class'] = "mediawiki $userdir sitedir-$sitedir";
 
-               if ( $wgLang->capitalizeAllNouns() ) {
+               if ( $this->getContext()->getLang()->capitalizeAllNouns() ) {
                        # A <body> class is probably not the best way to do this . . .
                        $bodyAttrs['class'] .= ' capitalize-all-nouns';
                }
@@ -2384,6 +2336,44 @@ class OutputPage {
                return $ret;
        }
 
+       /**
+        * Add the default ResourceLoader modules to this object
+        */
+       private function addDefaultModules() {
+               global $wgIncludeLegacyJavaScript,
+                       $wgUseAjax, $wgAjaxWatch, $wgEnableMWSuggest;
+
+               // Add base resources
+               $this->addModules( array(
+                       'mediawiki.user',
+                       'mediawiki.util',
+                       'mediawiki.page.startup',
+                       'mediawiki.page.ready',
+               ) );
+               if ( $wgIncludeLegacyJavaScript ){
+                       $this->addModules( 'mediawiki.legacy.wikibits' );
+               }
+
+               // Add various resources if required
+               if ( $wgUseAjax ) {
+                       $this->addModules( 'mediawiki.legacy.ajax' );
+
+                       wfRunHooks( 'AjaxAddScript', array( &$this ) );
+
+                       if( $wgAjaxWatch && $this->getUser()->isLoggedIn() ) {
+                               $this->addModules( 'mediawiki.action.watch.ajax' );
+                       }
+
+                       if ( $wgEnableMWSuggest && !$this->getUser()->getOption( 'disablesuggest', false ) ) {
+                               $this->addModules( 'mediawiki.page.mwsuggest' );
+                       }
+               }
+
+               if( $this->getUser()->getBoolOption( 'editsectiononrightclick' ) ) {
+                       $this->addModules( 'mediawiki.action.view.rightClickEdit' );
+               }
+       }
+
        /**
         * Get a ResourceLoader object associated with this OutputPage
         *
@@ -2394,7 +2384,7 @@ class OutputPage {
                        $this->mResourceLoader = new ResourceLoader();
                }
                return $this->mResourceLoader;
-       }               
+       }
 
        /**
         * TODO: Document
@@ -2405,13 +2395,12 @@ class OutputPage {
         * @return string html <script> and <style> tags
         */
        protected function makeResourceLoaderLink( Skin $skin, $modules, $only, $useESI = false ) {
-               global $wgUser, $wgLang, $wgLoadScript, $wgResourceLoaderUseESI,
-                       $wgResourceLoaderInlinePrivateModules, $wgRequest;
+               global $wgLoadScript, $wgResourceLoaderUseESI,
+                       $wgResourceLoaderInlinePrivateModules;
                // Lazy-load ResourceLoader
                // TODO: Should this be a static function of ResourceLoader instead?
-               // TODO: Divide off modules starting with "user", and add the user parameter to them
                $baseQuery = array(
-                       'lang' => $wgLang->getCode(),
+                       'lang' => $this->getContext()->getLang()->getCode(),
                        'debug' => ResourceLoader::inDebugMode() ? 'true' : 'false',
                        'skin' => $skin->getSkinName(),
                        'only' => $only,
@@ -2420,7 +2409,7 @@ class OutputPage {
                if ( $this->isPrintable() ) {
                        $baseQuery['printable'] = 1;
                }
-               if ( $wgRequest->getBool( 'handheld' ) ) {
+               if ( $this->getRequest()->getBool( 'handheld' ) ) {
                        $baseQuery['handheld'] = 1;
                }
 
@@ -2470,10 +2459,10 @@ class OutputPage {
                foreach ( $groups as $group => $modules ) {
                        $query = $baseQuery;
                        // Special handling for user-specific groups
-                       if ( ( $group === 'user' || $group === 'private' ) && $wgUser->isLoggedIn() ) {
-                               $query['user'] = $wgUser->getName();
+                       if ( ( $group === 'user' || $group === 'private' ) && $this->getUser()->isLoggedIn() ) {
+                               $query['user'] = $this->getUser()->getName();
                        }
-                       
+
                        // Create a fake request based on the one we are about to make so modules return
                        // correct timestamp and emptiness data
                        $context = new ResourceLoaderContext( $resourceLoader, new FauxRequest( $query ) );
@@ -2487,9 +2476,9 @@ class OutputPage {
                        if ( $modules === array() ) {
                                continue;
                        }
-                       
-                       $query['modules'] = implode( '|', array_keys( $modules ) );
-                       
+
+                       $query['modules'] = ResourceLoader::makePackedModulesString( array_keys( $modules ) );
+
                        // Support inlining of private modules if configured as such
                        if ( $group === 'private' && $wgResourceLoaderInlinePrivateModules ) {
                                if ( $only == ResourceLoaderModule::TYPE_STYLES ) {
@@ -2505,10 +2494,12 @@ class OutputPage {
                                }
                                continue;
                        }
-                       // Special handling for user and site groups; because users might change their stuff
-                       // on-wiki like site or user pages, or user preferences; we need to find the highest
+                       // Special handling for the user group; because users might change their stuff
+                       // on-wiki like user pages, or user preferences; we need to find the highest
                        // timestamp of these user-changable modules so we can ensure cache misses on change
-                       if ( $group === 'user' || $group === 'site' ) {
+                       // This should NOT be done for the site group (bug 27564) because anons get that too
+                       // and we shouldn't be putting timestamps in Squid-cached HTML
+                       if ( $group === 'user' ) {
                                // Get the maximum timestamp
                                $timestamp = 1;
                                foreach ( $modules as $module ) {
@@ -2521,6 +2512,9 @@ class OutputPage {
                        ksort( $query );
 
                        $url = wfAppendQuery( $wgLoadScript, $query );
+                       // Prevent the IE6 extension check from being triggered (bug 28840)
+                       // by appending a character that's invalid in Windows extensions ('*')
+                       $url .= '&*';
                        if ( $useESI && $wgResourceLoaderUseESI ) {
                                $esi = Xml::element( 'esi:include', array( 'src' => $url ) );
                                if ( $only == ResourceLoaderModule::TYPE_STYLES ) {
@@ -2531,9 +2525,9 @@ class OutputPage {
                        } else {
                                // Automatically select style/script elements
                                if ( $only === ResourceLoaderModule::TYPE_STYLES ) {
-                                       $link = Html::linkedStyle( wfAppendQuery( $wgLoadScript, $query ) );
+                                       $link = Html::linkedStyle( $url );
                                } else {
-                                       $link = Html::linkedScript( wfAppendQuery( $wgLoadScript, $query ) );
+                                       $link = Html::linkedScript( $url );
                                }
                        }
 
@@ -2547,57 +2541,90 @@ class OutputPage {
        }
 
        /**
-        * Gets the global variables and mScripts; also adds userjs to the end if
-        * enabled. Despite the name, these scripts are no longer put in the
-        * <head> but at the bottom of the <body>
+        * JS stuff to put in the <head>. This is the startup module, config
+        * vars and modules marked with position 'top'
         *
         * @param $sk Skin object to use
         * @return String: HTML fragment
         */
        function getHeadScripts( Skin $sk ) {
-               global $wgUser, $wgRequest, $wgUseSiteJs, $wgAllowUserJs;
-
                // Startup - this will immediately load jquery and mediawiki modules
                $scripts = $this->makeResourceLoaderLink( $sk, 'startup', ResourceLoaderModule::TYPE_SCRIPTS, true );
 
-               // Script and Messages "only" requests
-               $scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleScripts( true ), ResourceLoaderModule::TYPE_SCRIPTS );
-               $scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleMessages( true ), ResourceLoaderModule::TYPE_MESSAGES );
-
-               // Modules requests - let the client calculate dependencies and batch requests as it likes
-               $loader = '';
-               if ( $this->getModules( true ) ) {
-                       $loader = Xml::encodeJsCall( 'mw.loader.load', array( $this->getModules( true ) ) ) .
-                               Xml::encodeJsCall( 'mw.loader.go', array() );
-               }
-               
+               // Load config before anything else
                $scripts .= Html::inlineScript(
                        ResourceLoader::makeLoaderConditionalScript(
-                               ResourceLoader::makeConfigSetScript( $this->getJSVars() ) . $loader
+                               ResourceLoader::makeConfigSetScript( $this->getJSVars() )
                        )
                );
 
+               // Script and Messages "only" requests marked for top inclusion
+               // Messages should go first
+               $scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleMessages( true, 'top' ), ResourceLoaderModule::TYPE_MESSAGES );
+               $scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleScripts( true, 'top' ), ResourceLoaderModule::TYPE_SCRIPTS );
+
+               // Modules requests - let the client calculate dependencies and batch requests as it likes
+               // Only load modules that have marked themselves for loading at the top
+               $modules = $this->getModules( true, 'top' );
+               if ( $modules ) {
+                       $scripts .= Html::inlineScript(
+                               ResourceLoader::makeLoaderConditionalScript(
+                                       Xml::encodeJsCall( 'mw.loader.load', array( $modules ) )
+                               )
+                       );
+               }
+
+               return $scripts;
+       }
+
+       /**
+        * JS stuff to put at the bottom of the <body>: modules marked with position 'bottom',
+        * legacy scripts ($this->mScripts), user preferences, site JS and user JS
+        *
+        * @param $sk Skin
+        *
+        * @return string
+        */
+       function getBottomScripts( Skin $sk ) {
+               global $wgUseSiteJs, $wgAllowUserJs;
+
+               // Script and Messages "only" requests marked for bottom inclusion
+               // Messages should go first
+               $scripts = $this->makeResourceLoaderLink( $sk, $this->getModuleMessages( true, 'bottom' ), ResourceLoaderModule::TYPE_MESSAGES );
+               $scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleScripts( true, 'bottom' ), ResourceLoaderModule::TYPE_SCRIPTS );
+
+               // Modules requests - let the client calculate dependencies and batch requests as it likes
+               // Only load modules that have marked themselves for loading at the bottom
+               $modules = $this->getModules( true, 'bottom' );
+               if ( $modules ) {
+                       $scripts .= Html::inlineScript(
+                               ResourceLoader::makeLoaderConditionalScript(
+                                       Xml::encodeJsCall( 'mw.loader.load', array( $modules ) )
+                               )
+                       );
+               }
+
                // Legacy Scripts
                $scripts .= "\n" . $this->mScripts;
 
-               $userScripts = array( 'user.options' );
+               $userScripts = array( 'user.options', 'user.tokens' );
 
                // Add site JS if enabled
                if ( $wgUseSiteJs ) {
                        $scripts .= $this->makeResourceLoaderLink( $sk, 'site', ResourceLoaderModule::TYPE_SCRIPTS );
-                       if( $wgUser->isLoggedIn() ){
+                       if( $this->getUser()->isLoggedIn() ){
                                $userScripts[] = 'user.groups';
                        }
                }
 
                // Add user JS if enabled
-               if ( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
-                       $action = $wgRequest->getVal( 'action', 'view' );
-                       if( $this->mTitle && $this->mTitle->isJsSubpage() && $sk->userCanPreview( $action ) ) {
+               if ( $wgAllowUserJs && $this->getUser()->isLoggedIn() ) {
+                       $action = $this->getRequest()->getVal( 'action', 'view' );
+                       if( $this->getTitle() && $this->getTitle()->isJsSubpage() && $sk->userCanPreview( $action ) ) {
                                # XXX: additional security check/prompt?
-                               $scripts .= Html::inlineScript( "\n" . $wgRequest->getText( 'wpTextbox1' ) . "\n" ) . "\n";
+                               $scripts .= Html::inlineScript( "\n" . $this->getRequest()->getText( 'wpTextbox1' ) . "\n" ) . "\n";
                        } else {
-                               # FIXME: this means that User:Me/Common.js doesn't load when previewing
+                               # @todo FIXME: This means that User:Me/Common.js doesn't load when previewing
                                # User:Me/Vector.js, and vice versa (bug26283)
                                $userScripts[] = 'user';
                        }
@@ -2609,21 +2636,20 @@ class OutputPage {
 
        /**
         * Get an array containing global JS variables
-        * 
+        *
         * 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.
         */
        protected function getJSVars() {
-               global $wgUser, $wgRequest, $wgUseAjax, $wgEnableMWSuggest, $wgContLang;
+               global $wgUseAjax, $wgEnableMWSuggest, $wgContLang;
 
                $title = $this->getTitle();
                $ns = $title->getNamespace();
                $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $title->getNsText();
                if ( $ns == NS_SPECIAL ) {
-                       $parts = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
-                       $canonicalName = $parts[0];
+                       list( $canonicalName, /*...*/ ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
                } else {
                        $canonicalName = false; # bug 21115
                }
@@ -2637,9 +2663,9 @@ class OutputPage {
                        'wgCurRevisionId' => $title->getLatestRevID(),
                        'wgArticleId' => $title->getArticleId(),
                        'wgIsArticle' => $this->isArticle(),
-                       'wgAction' => $wgRequest->getText( 'action', 'view' ),
-                       'wgUserName' => $wgUser->isAnon() ? null : $wgUser->getName(),
-                       'wgUserGroups' => $wgUser->getEffectiveGroups(),
+                       'wgAction' => $this->getRequest()->getText( 'action', 'view' ),
+                       'wgUserName' => $this->getUser()->isAnon() ? null : $this->getUser()->getName(),
+                       'wgUserGroups' => $this->getUser()->getEffectiveGroups(),
                        'wgCategories' => $this->getCategories(),
                        'wgBreakFrames' => $this->getFrameOptions() == 'DENY',
                );
@@ -2649,39 +2675,64 @@ class OutputPage {
                foreach ( $title->getRestrictionTypes() as $type ) {
                        $vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type );
                }
-               if ( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
-                       $vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $wgUser );
+               if ( $wgUseAjax && $wgEnableMWSuggest && !$this->getUser()->getOption( 'disablesuggest', false ) ) {
+                       $vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $this->getUser() );
+               }
+               if ( $title->isMainPage() ) {
+                       $vars['wgIsMainPage'] = true;
                }
-               
+
                // Allow extensions to add their custom variables to the global JS variables
                wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
-               
+
                return $vars;
        }
 
        /**
-        * Add default \<meta\> tags
+        * @param $sk Skin
+        * @param $addContentType bool
+        *
+        * @return string HTML tag links to be put in the header.
         */
-       protected function addDefaultMeta() {
-               global $wgVersion, $wgHtml5;
+       public function getHeadLinks( Skin $sk, $addContentType = false ) {
+               global $wgUniversalEditButton, $wgFavicon, $wgAppleTouchIcon, $wgEnableAPI,
+                       $wgSitename, $wgVersion, $wgHtml5, $wgMimeType,
+                       $wgFeed, $wgOverrideSiteFeed, $wgAdvertisedFeedTypes,
+                       $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang,
+                       $wgRightsPage, $wgRightsUrl;
 
-               static $called = false;
-               if ( $called ) {
-                       # Don't run this twice
-                       return;
-               }
-               $called = true;
+               $tags = array();
 
-               if ( !$wgHtml5 ) {
-                       $this->addMeta( 'http:Content-Style-Type', 'text/css' ); // bug 15835
+               if ( $addContentType ) {
+                       if ( $wgHtml5 ) {
+                               # More succinct than <meta http-equiv=Content-Type>, has the
+                               # same effect
+                               $tags[] = Html::element( 'meta', array( 'charset' => 'UTF-8' ) );
+                       } else {
+                               $tags[] = Html::element( 'meta', array(
+                                       'http-equiv' => 'Content-Type',
+                                       'content' => "$wgMimeType; charset=UTF-8"
+                               ) );
+                               $tags[] = Html::element( 'meta', array(  // bug 15835
+                                       'http-equiv' => 'Content-Style-Type',
+                                       'content' => 'text/css'
+                               ) );
+                       }
                }
-               $this->addMeta( 'generator', "MediaWiki $wgVersion" );
+
+               $tags[] = Html::element( 'meta', array(
+                       'name' => 'generator',
+                       'content' => "MediaWiki $wgVersion",
+               ) );
 
                $p = "{$this->mIndexPolicy},{$this->mFollowPolicy}";
                if( $p !== 'index,follow' ) {
                        // http://www.robotstxt.org/wc/meta-user.html
                        // Only show if it's different from the default robots policy
-                       $this->addMeta( 'robots', $p );
+                       $tags[] = Html::element( 'meta', array(
+                               'name' => 'robots',
+                               'content' => $p,
+                       ) );
                }
 
                if ( count( $this->mKeywords ) > 0 ) {
@@ -2689,27 +2740,15 @@ class OutputPage {
                                "/<.*?" . ">/" => '',
                                "/_/" => ' '
                        );
-                       $this->addMeta(
-                               'keywords',
-                               preg_replace(
+                       $tags[] = Html::element( 'meta', array(
+                               'name' => 'keywords',
+                               'content' =>  preg_replace(
                                        array_keys( $strip ),
                                        array_values( $strip ),
                                        implode( ',', $this->mKeywords )
                                )
-                       );
+                       ) );
                }
-       }
-
-       /**
-        * @return string HTML tag links to be put in the header.
-        */
-       public function getHeadLinks( Skin $sk ) {
-               global $wgFeed;
-
-               // Ideally this should happen earlier, somewhere. :P
-               $this->addDefaultMeta();
-
-               $tags = array();
 
                foreach ( $this->mMetatags as $tag ) {
                        if ( 0 == strcasecmp( 'http:', substr( $tag[0], 0, 5 ) ) ) {
@@ -2725,16 +2764,115 @@ class OutputPage {
                                )
                        );
                }
+
                foreach ( $this->mLinktags as $tag ) {
                        $tags[] = Html::element( 'link', $tag );
                }
 
-               if( $wgFeed ) {
+               # Universal edit button
+               if ( $wgUniversalEditButton ) {
+                       if ( $this->isArticleRelated() && $this->getTitle() && $this->getTitle()->quickUserCan( 'edit' )
+                               && ( $this->getTitle()->exists() || $this->getTitle()->quickUserCan( 'create' ) ) ) {
+                               // Original UniversalEditButton
+                               $msg = wfMsg( 'edit' );
+                               $tags[] = Html::element( 'link', array(
+                                       'rel' => 'alternate',
+                                       'type' => 'application/x-wiki',
+                                       'title' => $msg,
+                                       'href' => $this->getTitle()->getLocalURL( 'action=edit' )
+                               ) );
+                               // Alternate edit link
+                               $tags[] = Html::element( 'link', array(
+                                       'rel' => 'edit',
+                                       'title' => $msg,
+                                       'href' => $this->getTitle()->getLocalURL( 'action=edit' )
+                               ) );
+                       }
+               }
+
+               # 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 ( $wgAppleTouchIcon !== false ) {
+                       $tags[] = Html::element( 'link', array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
+               }
+
+               if ( $wgFavicon !== false ) {
+                       $tags[] = Html::element( 'link', array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
+               }
+
+               # OpenSearch description link
+               $tags[] = Html::element( 'link', 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)
+                       $tags[] = Html::element( 'link', array(
+                               'rel' => 'EditURI',
+                               'type' => 'application/rsd+xml',
+                               'href' => wfExpandUrl( wfAppendQuery( wfScript( 'api' ), array( 'action' => 'rsd' ) ) ),
+                       ) );
+               }
+
+               # Language variants
+               if ( !$wgDisableLangConversion && $wgCanonicalLanguageLinks
+                       && $wgContLang->hasVariants() ) {
+
+                       $urlvar = $wgContLang->getURLVariant();
+
+                       if ( !$urlvar ) {
+                               $variants = $wgContLang->getVariants();
+                               foreach ( $variants as $_v ) {
+                                       $tags[] = Html::element( 'link', array(
+                                               'rel' => 'alternate',
+                                               'hreflang' => $_v,
+                                               'href' => $this->getTitle()->getLocalURL( '', $_v ) )
+                                       );
+                               }
+                       } else {
+                               $tags[] = Html::element( 'link', array(
+                                       'rel' => 'canonical',
+                                       'href' => $this->getTitle()->getFullURL() )
+                               );
+                       }
+               }
+
+               # Copyright
+               $copyright = '';
+               if ( $wgRightsPage ) {
+                       $copy = Title::newFromText( $wgRightsPage );
+
+                       if ( $copy ) {
+                               $copyright = $copy->getLocalURL();
+                       }
+               }
+
+               if ( !$copyright && $wgRightsUrl ) {
+                       $copyright = $wgRightsUrl;
+               }
+
+               if ( $copyright ) {
+                       $tags[] = Html::element( 'link', array(
+                               'rel' => 'copyright',
+                               'href' => $copyright )
+                       );
+               }
+
+               # Feeds
+               if ( $wgFeed ) {
                        foreach( $this->getSyndicationLinks() as $format => $link ) {
-                               # Use the page name for the title (accessed through $wgTitle since
-                               # there's no other way).  In principle, this could lead to issues
-                               # with having the same name for different feeds corresponding to
-                               # the same page, but we can't avoid that at this low a level.
+                               # Use the page name for the title.  In principle, this could
+                               # lead to issues with having the same name for different feeds
+                               # corresponding to the same page, but we can't avoid that at
+                               # this low a level.
 
                                $tags[] = $this->feedLink(
                                        $format,
@@ -2752,7 +2890,6 @@ class OutputPage {
                        # or "Breaking news" one). For this, we see if $wgOverrideSiteFeed is defined.
                        # If so, use it instead.
 
-                       global $wgOverrideSiteFeed, $wgSitename, $wgAdvertisedFeedTypes;
                        $rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
 
                        if ( $wgOverrideSiteFeed ) {
@@ -2830,6 +2967,8 @@ class OutputPage {
         * Build a set of <link>s for the stylesheets specified in the $this->styles array.
         * These will be applied to various media & IE conditionals.
         * @param $sk Skin object
+        *
+        * @return string
         */
        public function buildCssLinks( $sk ) {
                $ret = '';
@@ -2854,7 +2993,7 @@ class OutputPage {
                // Add marker tag to mark the place where the client-side loader should inject dynamic styles
                // We use a <meta> tag with a made-up name for this because that's valid HTML
                $ret .= Html::element( 'meta', array( 'name' => 'ResourceLoaderDynamicStyles', 'content' => '' ) ) . "\n";
-               
+
                // Add site, private and user styles
                // 'private' at present only contains user.options, so put that before 'user'
                // Any future private modules will likely have a similar user-specific character
@@ -2887,8 +3026,8 @@ class OutputPage {
         */
        protected function styleLink( $style, $options ) {
                if( isset( $options['dir'] ) ) {
-                       $siteDir = wfUILang()->getDir();
-                       if( $siteDir != $options['dir'] ) {
+                       global $wgLang;
+                       if( $wgLang->getDir() != $options['dir'] ) {
                                return '';
                        }
                }
@@ -2959,43 +3098,6 @@ class OutputPage {
                return $media;
        }
 
-       /**
-        * Turn off regular page output and return an error reponse
-        * for when rate limiting has triggered.
-        */
-       public function rateLimited() {
-               $this->setPageTitle( wfMsg( 'actionthrottled' ) );
-               $this->setRobotPolicy( 'noindex,follow' );
-               $this->setArticleRelated( false );
-               $this->enableClientCache( false );
-               $this->mRedirect = '';
-               $this->clearHTML();
-               $this->setStatusCode( 503 );
-               $this->addWikiMsg( 'actionthrottledtext' );
-
-               $this->returnToMain( null, $this->getTitle() );
-       }
-
-       /**
-        * Show a warning about slave lag
-        *
-        * If the lag is higher than $wgSlaveLagCritical seconds,
-        * then the warning is a bit more obvious. If the lag is
-        * lower than $wgSlaveLagWarning, then no warning is shown.
-        *
-        * @param $lag Integer: slave lag
-        */
-       public function showLagWarning( $lag ) {
-               global $wgSlaveLagWarning, $wgSlaveLagCritical, $wgLang;
-               if( $lag >= $wgSlaveLagWarning ) {
-                       $message = $lag < $wgSlaveLagCritical
-                               ? 'lag-warn-normal'
-                               : 'lag-warn-high';
-                       $wrap = Html::rawElement( 'div', array( 'class' => "mw-{$message}" ), "\n$1\n" );
-                       $this->wrapWikiMsg( "$wrap\n", array( $message, $wgLang->formatNum( $lag ) ) );
-               }
-       }
-
        /**
         * Add a wikitext-formatted message to the output.
         * This is equivalent to:
@@ -3014,6 +3116,10 @@ class OutputPage {
         * instead of a variable argument list.
         *
         * $options is passed through to wfMsgExt(), see that function for details.
+        *
+        * @param $name string
+        * @param $args array
+        * @param $options array
         */
        public function addWikiMsgArray( $name, $args, $options = array() ) {
                $options[] = 'parse';
@@ -3044,6 +3150,8 @@ class OutputPage {
         *    $wgOut->addWikiText( "<div class='error'>\n" . wfMsgNoTrans( 'some-error' ) . "\n</div>" );
         *
         * The newline after opening div is needed in some wikitext. See bug 19226.
+        *
+        * @param $wrap string
         */
        public function wrapWikiMsg( $wrap /*, ...*/ ) {
                $msgSpecs = func_get_args();
@@ -3075,7 +3183,7 @@ class OutputPage {
         * @param $modules Array: list of jQuery modules which should be loaded
         * @return Array: the list of modules which were not loaded.
         * @since 1.16
-        * @deprecated @since 1.17
+        * @deprecated since 1.17
         */
        public function includeJQuery( $modules = array() ) {
                return array();