X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=2023d9183cd6fdbc91e91633cf6a920cb0049a0e;hb=2c35b5be5f8fc477cdd7e4d832de58de3a6ca3d9;hp=edffc3bd03baba3246aa853a3224c53e2e732b0b;hpb=6a2c1ec30b75003a7f0259477cf4616090f30607;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index edffc3bd03..2023d9183c 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -746,10 +746,10 @@ class OutputPage extends ContextSource {
 			'user' => $this->getUser()->getTouched(),
 			'epoch' => $config->get( 'CacheEpoch' )
 		];
-		if ( $config->get( 'UseSquid' ) ) {
+		if ( $config->get( 'UseCdn' ) ) {
 			$modifiedTimes['sepoch'] = wfTimestamp( TS_MW, $this->getCdnCacheEpoch(
 				time(),
-				$config->get( 'SquidMaxage' )
+				$config->get( 'CdnMaxAge' )
 			) );
 		}
 		Hooks::run( 'OutputPageCheckLastModified', [ &$modifiedTimes, $this ] );
@@ -818,7 +818,7 @@ class OutputPage extends ContextSource {
 	 * @return int Timestamp
 	 */
 	private function getCdnCacheEpoch( $reqTime, $maxAge ) {
-		// Ensure Last-Modified is never more than (wgSquidMaxage) in the past,
+		// Ensure Last-Modified is never more than $wgCdnMaxAge in the past,
 		// because even if the wiki page content hasn't changed since, static
 		// resources may have changed (skin HTML, interface messages, urls, etc.)
 		// and must roll-over in a timely manner (T46570)
@@ -1723,7 +1723,7 @@ class OutputPage extends ContextSource {
 	/**
 	 * Get the files used on this page
 	 *
-	 * @return array (dbKey => array('time' => MW timestamp or null, 'sha1' => sha1 or ''))
+	 * @return array [ dbKey => [ 'time' => MW timestamp or null, 'sha1' => sha1 or '' ] ]
 	 * @since 1.18
 	 */
 	public function getFileSearchOptions() {
@@ -2248,12 +2248,12 @@ class OutputPage extends ContextSource {
 	 *
 	 * @param string|int|float|bool|null $mtime Last-Modified timestamp
 	 * @param int $minTTL Minimum TTL in seconds [default: 1 minute]
-	 * @param int $maxTTL Maximum TTL in seconds [default: $wgSquidMaxage]
+	 * @param int $maxTTL Maximum TTL in seconds [default: $wgCdnMaxAge]
 	 * @since 1.28
 	 */
 	public function adaptCdnTTL( $mtime, $minTTL = 0, $maxTTL = 0 ) {
 		$minTTL = $minTTL ?: IExpiringStore::TTL_MINUTE;
-		$maxTTL = $maxTTL ?: $this->getConfig()->get( 'SquidMaxage' );
+		$maxTTL = $maxTTL ?: $this->getConfig()->get( 'CdnMaxAge' );
 
 		if ( $mtime === null || $mtime === false ) {
 			return $minTTL; // entity does not exist
@@ -2567,7 +2567,7 @@ class OutputPage extends ContextSource {
 
 		if ( $this->mEnableClientCache ) {
 			if (
-				$config->get( 'UseSquid' ) &&
+				$config->get( 'UseCdn' ) &&
 				!$response->hasCookies() &&
 				!SessionManager::getGlobalSession()->isPersistent() &&
 				!$this->isPrintable() &&
@@ -2584,7 +2584,7 @@ class OutputPage extends ContextSource {
 					# start with a shorter timeout for initial testing
 					# header( 'Surrogate-Control: max-age=2678400+2678400, content="ESI/1.0"');
 					$response->header(
-						"Surrogate-Control: max-age={$config->get( 'SquidMaxage' )}" .
+						"Surrogate-Control: max-age={$config->get( 'CdnMaxAge' )}" .
 						"+{$this->mCdnMaxage}, content=\"ESI/1.0\""
 					);
 					$response->header( 'Cache-Control: s-maxage=0, must-revalidate, max-age=0' );
@@ -2882,8 +2882,11 @@ class OutputPage extends ContextSource {
 					$query['returntoquery'] = wfArrayToCgi( $returntoquery );
 				}
 			}
+
+			$services = MediaWikiServices::getInstance();
+
 			$title = SpecialPage::getTitleFor( 'Userlogin' );
-			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+			$linkRenderer = $services->getLinkRenderer();
 			$loginUrl = $title->getLinkURL( $query, false, PROTO_RELATIVE );
 			$loginLink = $linkRenderer->makeKnownLink(
 				$title,
@@ -2895,9 +2898,13 @@ class OutputPage extends ContextSource {
 			$this->prepareErrorPage( $this->msg( 'loginreqtitle' ) );
 			$this->addHTML( $this->msg( $msg )->rawParams( $loginLink )->params( $loginUrl )->parse() );
 
+			$permissionManager = $services->getPermissionManager();
+
 			# Don't return to a page the user can't read otherwise
 			# we'll end up in a pointless loop
-			if ( $displayReturnto && $displayReturnto->userCan( 'read', $this->getUser() ) ) {
+			if ( $displayReturnto && $permissionManager->userCan(
+				'read', $this->getUser(), $displayReturnto
+			) ) {
 				$this->returnToMain( null, $displayReturnto );
 			}
 		} else {
@@ -3215,7 +3222,7 @@ class OutputPage extends ContextSource {
 				),
 				[ 'html5shiv' ],
 				ResourceLoaderModule::TYPE_SCRIPTS,
-				[ 'sync' => true ],
+				[ 'raw' => '1', 'sync' => '1' ],
 				$this->getCSPNonce()
 			) .
 			'<![endif]-->';
@@ -4214,9 +4221,7 @@ class OutputPage extends ContextSource {
 			'oojs-ui.styles.indicators',
 			'oojs-ui.styles.textures',
 			'mediawiki.widgets.styles',
-			'oojs-ui.styles.icons-content',
-			'oojs-ui.styles.icons-alerts',
-			'oojs-ui.styles.icons-interactions',
+			'oojs-ui-core.icons',
 		] );
 	}