Merge "Work around T87871 to avoid double-loading OOjs UI PHP styles"

diff --combined includes/OutputPage.php
index 317c126,494e857..f161cb3
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -21,7 -21,6 +21,7 @@@
   */
  
  use MediaWiki\Logger\LoggerFactory;
 +use MediaWiki\Session\SessionManager;
  use WrappedString\WrappedString;
  
  /**
@@@ -1573,42 -1572,11 +1573,42 @@@ class OutputPage extends ContextSource 
         * @return ParserOptions
         */
        public function parserOptions( $options = null ) {
 +              if ( $options !== null && !empty( $options->isBogus ) ) {
 +                      // Someone is trying to set a bogus pre-$wgUser PO. Check if it has
 +                      // been changed somehow, and keep it if so.
 +                      $anonPO = ParserOptions::newFromAnon();
 +                      $anonPO->setEditSection( false );
 +                      if ( !$options->matches( $anonPO ) ) {
 +                              wfLogWarning( __METHOD__ . ': Setting a changed bogus ParserOptions: ' . wfGetAllCallers( 5 ) );
 +                              $options->isBogus = false;
 +                      }
 +              }
 +
                if ( !$this->mParserOptions ) {
 +                      if ( !$this->getContext()->getUser()->isSafeToLoad() ) {
 +                              // $wgUser isn't unstubbable yet, so don't try to get a
 +                              // ParserOptions for it. And don't cache this ParserOptions
 +                              // either.
 +                              $po = ParserOptions::newFromAnon();
 +                              $po->setEditSection( false );
 +                              $po->isBogus = true;
 +                              if ( $options !== null ) {
 +                                      $this->mParserOptions = empty( $options->isBogus ) ? $options : null;
 +                              }
 +                              return $po;
 +                      }
 +
                        $this->mParserOptions = ParserOptions::newFromContext( $this->getContext() );
                        $this->mParserOptions->setEditSection( false );
                }
 -              return wfSetVar( $this->mParserOptions, $options );
 +
 +              if ( $options !== null && !empty( $options->isBogus ) ) {
 +                      // They're trying to restore the bogus pre-$wgUser PO. Do the right
 +                      // thing.
 +                      return wfSetVar( $this->mParserOptions, null, true );
 +              } else {
 +                      return wfSetVar( $this->mParserOptions, $options );
 +              }
        }
  
        /**
@@@ -2009,9 -1977,11 +2009,9 @@@
                if ( $cookies === null ) {
                        $config = $this->getConfig();
                        $cookies = array_merge(
 +                              SessionManager::singleton()->getVaryCookies(),
                                array(
 -                                      $config->get( 'CookiePrefix' ) . 'Token',
 -                                      $config->get( 'CookiePrefix' ) . 'LoggedOut',
 -                                      "forceHTTPS",
 -                                      session_name()
 +                                      'forceHTTPS',
                                ),
                                $config->get( 'CacheVaryCookies' )
                        );
@@@ -2063,9 -2033,6 +2063,9 @@@
         * @return string
         */
        public function getVaryHeader() {
 +              foreach ( SessionManager::singleton()->getVaryHeaders() as $header => $options ) {
 +                      $this->addVaryHeader( $header, $options );
 +              }
                return 'Vary: ' . join( ', ', array_keys( $this->mVaryHeader ) );
        }
  
@@@ -2083,10 -2050,6 +2083,10 @@@
                }
                $this->addVaryHeader( 'Cookie', $cookiesOption );
  
 +              foreach ( SessionManager::singleton()->getVaryHeaders() as $header => $options ) {
 +                      $this->addVaryHeader( $header, $options );
 +              }
 +
                $headers = array();
                foreach ( $this->mVaryHeader as $header => $option ) {
                        $newheader = $header;
@@@ -2210,8 -2173,8 +2210,8 @@@
  
                if ( $this->mEnableClientCache ) {
                        if (
 -                              $config->get( 'UseSquid' ) && session_id() == '' && !$this->isPrintable() &&
 -                              $this->mCdnMaxage != 0 && !$this->haveCacheVaryCookies()
 +                              $config->get( 'UseSquid' ) && !SessionManager::getGlobalSession()->isPersistent() &&
 +                              !$this->isPrintable() && $this->mCdnMaxage != 0 && !$this->haveCacheVaryCookies()
                        ) {
                                if ( $config->get( 'UseESI' ) ) {
                                        # We'll purge the proxy cache explicitly, but require end user agents
@@@ -4088,5 -4051,8 +4088,8 @@@
                        'oojs-ui.styles.textures',
                        'mediawiki.widgets.styles',
                ) );
+               // Used by 'skipFunction' of the four 'oojs-ui.styles.*' modules. Please don't treat this as a
+               // public API or you'll be severely disappointed when T87871 is fixed and it disappears.
+               $this->addMeta( 'X-OOUI-PHP', '1' );
        }
  }