X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWiki.php;h=ca77121b6bda800f4f41c2030c2f738abfda4c56;hb=aa88db48256434308d26e3b641d0f616725dcb03;hp=990ed4e3580310c31223fd5e2fb60a551d56ffcc;hpb=b5e255e914f0fe70890f8ac61d9d19476699873e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 990ed4e358..ca77121b6b 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -262,7 +262,7 @@ class MediaWiki {
 						$target = $specialPage->getRedirect( $subpage );
 						// target can also be true. We let that case fall through to normal processing.
 						if ( $target instanceof Title ) {
-							$query = $specialPage->getRedirectQuery() ?: [];
+							$query = $specialPage->getRedirectQuery( $subpage ) ?: [];
 							$request = new DerivativeRequest( $this->context->getRequest(), $query );
 							$request->setRequestURL( $this->context->getRequest()->getRequestURL() );
 							$this->context->setRequest( $request );
@@ -486,14 +486,14 @@ class MediaWiki {
 			}
 
 			# Let CDN cache things if we can purge them.
-			if ( $this->config->get( 'UseSquid' ) &&
+			if ( $this->config->get( 'UseCdn' ) &&
 				in_array(
 					// Use PROTO_INTERNAL because that's what getCdnUrls() uses
 					wfExpandUrl( $request->getRequestURL(), PROTO_INTERNAL ),
 					$requestTitle->getCdnUrls()
 				)
 			) {
-				$output->setCdnMaxage( $this->config->get( 'SquidMaxage' ) );
+				$output->setCdnMaxage( $this->config->get( 'CdnMaxAge' ) );
 			}
 
 			$action->show();
@@ -597,7 +597,7 @@ class MediaWiki {
 		wfDebug( __METHOD__ . ': primary transaction round committed' );
 
 		// Run updates that need to block the user or affect output (this is the last chance)
-		DeferredUpdates::doUpdates( 'enqueue', DeferredUpdates::PRESEND );
+		DeferredUpdates::doUpdates( 'run', DeferredUpdates::PRESEND );
 		wfDebug( __METHOD__ . ': pre-send deferred updates completed' );
 		// T214471: persist the session to avoid race conditions on subsequent requests
 		$request->getSession()->save();