Merge "Add wgRevisionId variable to ResourceLoader"

diff --combined includes/OutputPage.php
index e628834,a020def..6904432
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -1534,7 -1534,7 +1534,7 @@@ class OutputPage extends ContextSource 
  
                $popts = $this->parserOptions();
                $oldTidy = $popts->setTidy( $tidy );
 -              $popts->setInterfaceMessage( (bool) $interface );
 +              $popts->setInterfaceMessage( (bool)$interface );
  
                $parserOutput = $wgParser->parse(
                        $text, $title, $popts,
@@@ -1721,7 -1721,6 +1721,7 @@@
                                array(
                                        "{$wgCookiePrefix}Token",
                                        "{$wgCookiePrefix}LoggedOut",
 +                                      "forceHTTPS",
                                        session_name()
                                ),
                                $wgCacheVaryCookies
@@@ -2433,6 -2432,14 +2433,6 @@@ $template
         * @param $options Options array to pass to Linker
         */
        public function addReturnTo( $title, $query = array(), $text = null, $options = array() ) {
 -              if ( in_array( 'http', $options ) ) {
 -                      $proto = PROTO_HTTP;
 -              } elseif ( in_array( 'https', $options ) ) {
 -                      $proto = PROTO_HTTPS;
 -              } else {
 -                      $proto = PROTO_RELATIVE;
 -              }
 -
                $link = $this->msg( 'returnto' )->rawParams(
                        Linker::link( $title, $text, array(), $query, $options ) )->escaped();
                $this->addHTML( "<p id=\"mw-returnto\">{$link}</p>\n" );
@@@ -2482,6 -2489,10 +2482,6 @@@
                $userdir = $this->getLanguage()->getDir();
                $sitedir = $wgContLang->getDir();
  
 -              if ( $sk->commonPrintStylesheet() ) {
 -                      $this->addModuleStyles( 'mediawiki.legacy.wikiprintable' );
 -              }
 -
                $ret = Html::htmlHeader( array( 'lang' => $this->getLanguage()->getHtmlCode(), 'dir' => $userdir, 'class' => 'client-nojs' ) );
  
                if ( $this->getHTMLTitle() == '' ) {
@@@ -2574,7 -2585,7 +2574,7 @@@
        protected function makeResourceLoaderLink( $modules, $only, $useESI = false, array $extraQuery = array(), $loadCall = false ) {
                global $wgResourceLoaderUseESI;
  
 -              $modules = (array) $modules;
 +              $modules = (array)$modules;
  
                if ( !count( $modules ) ) {
                        return '';
@@@ -3011,6 -3022,7 +3011,7 @@@
                        'wgPageName' => $title->getPrefixedDBkey(),
                        'wgTitle' => $title->getText(),
                        'wgCurRevisionId' => $latestRevID,
+                       'wgRevisionId' => (int)$this->getRevisionId(),
                        'wgArticleId' => $pageID,
                        'wgIsArticle' => $this->isArticle(),
                        'wgIsRedirect' => $title->isRedirect(),