X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Factions%2FRawAction.php;h=f6c4472f2ae8f012713b3c305995f7cc24e08087;hb=dfec83932fd38a9086eb5a2e212889ad00f35b0e;hp=c9d0ae968fc9833e56c4d5ddbe059584d1ddfd59;hpb=a38af7ba26579bb3004f673e44d39710887763aa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index c9d0ae968f..f6c4472f2a 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -27,6 +27,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 
 /**
  * A simple method to retrieve the plain source of an article,
@@ -49,6 +50,7 @@ class RawAction extends FormlessAction {
 
 	/**
 	 * @suppress SecurityCheck-XSS Non html mime type
+	 * @return string|null
 	 */
 	function onView() {
 		$this->getOutput()->disable();
@@ -57,16 +59,16 @@ class RawAction extends FormlessAction {
 		$config = $this->context->getConfig();
 
 		if ( !$request->checkUrlExtension() ) {
-			return;
+			return null;
 		}
 
 		if ( $this->getOutput()->checkLastModified( $this->page->getTouched() ) ) {
-			return; // Client cache fresh and headers sent, nothing more to do.
+			return null; // Client cache fresh and headers sent, nothing more to do.
 		}
 
 		$contentType = $this->getContentType();
 
-		$maxage = $request->getInt( 'maxage', $config->get( 'SquidMaxage' ) );
+		$maxage = $request->getInt( 'maxage', $config->get( 'CdnMaxAge' ) );
 		$smaxage = $request->getIntOrNull( 'smaxage' );
 		if ( $smaxage === null ) {
 			if (
@@ -86,9 +88,6 @@ class RawAction extends FormlessAction {
 
 		// Set standard Vary headers so cache varies on cookies and such (T125283)
 		$response->header( $this->getOutput()->getVaryHeader() );
-		if ( $config->get( 'UseKeyHeader' ) ) {
-			$response->header( $this->getOutput()->getKeyHeader() );
-		}
 
 		// Output may contain user-specific data;
 		// vary generated content for open sessions on private wikis
@@ -172,6 +171,8 @@ class RawAction extends FormlessAction {
 		}
 
 		echo $text;
+
+		return null;
 	}
 
 	/**
@@ -181,8 +182,6 @@ class RawAction extends FormlessAction {
 	 * @return string|bool
 	 */
 	public function getRawText() {
-		global $wgParser;
-
 		$text = false;
 		$title = $this->getTitle();
 		$request = $this->getRequest();
@@ -221,7 +220,7 @@ class RawAction extends FormlessAction {
 		}
 
 		if ( $text !== false && $text !== '' && $request->getRawVal( 'templates' ) === 'expand' ) {
-			$text = $wgParser->preprocess(
+			$text = MediaWikiServices::getInstance()->getParser()->preprocess(
 				$text,
 				$title,
 				ParserOptions::newFromContext( $this->getContext() )