X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FAjaxResponse.php;h=8e9f490fa29957d0d4376acafdfb553c887dc7b9;hb=358d2980cc6c817e727dfaf166bf975a57f20950;hp=a3808a549672c825191199ec95fc20def530ea2d;hpb=0ff2c62197fdaf79f82d8657afd70621725c9762;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index a3808a5496..8e9f490fa2 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -70,12 +70,19 @@ class AjaxResponse {
 	 */
 	private $mText;
 
+	/**
+	 * @var Config
+	 */
+	private $mConfig;
+
 	/**
 	 * @param string|null $text
+	 * @param Config|null $config
 	 */
-	function __construct( $text = null ) {
+	function __construct( $text = null, Config $config = null ) {
 		$this->mCacheDuration = null;
 		$this->mVary = null;
+		$this->mConfig = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
 
 		$this->mDisabled = false;
 		$this->mText = '';
@@ -132,7 +139,7 @@ class AjaxResponse {
 	 * @param string $text
 	 */
 	function addText( $text ) {
-		if ( ! $this->mDisabled && $text ) {
+		if ( !$this->mDisabled && $text ) {
 			$this->mText .= $text;
 		}
 	}
@@ -141,7 +148,7 @@ class AjaxResponse {
 	 * Output text
 	 */
 	function printText() {
-		if ( ! $this->mDisabled ) {
+		if ( !$this->mDisabled ) {
 			print $this->mText;
 		}
 	}
@@ -150,8 +157,6 @@ class AjaxResponse {
 	 * Construct the header and output it
 	 */
 	function sendHeaders() {
-		global $wgUseSquid, $wgUseESI;
-
 		if ( $this->mResponseCode ) {
 			$n = preg_replace( '/^ *(\d+)/', '\1', $this->mResponseCode );
 			header( "Status: " . $this->mResponseCode, true, (int)$n );
@@ -170,12 +175,12 @@ class AjaxResponse {
 			# and tell the client to always check with the squid. Otherwise,
 			# tell the client to use a cached copy, without a way to purge it.
 
-			if ( $wgUseSquid ) {
+			if ( $this->mConfig->get( 'UseSquid' ) ) {
 				# Expect explicit purge of the proxy cache, but require end user agents
 				# to revalidate against the proxy on each visit.
 				# Surrogate-Control controls our Squid, Cache-Control downstream caches
 
-				if ( $wgUseESI ) {
+				if ( $this->mConfig->get( 'UseESI' ) ) {
 					header( 'Surrogate-Control: max-age=' . $this->mCacheDuration . ', content="ESI/1.0"' );
 					header( 'Cache-Control: s-maxage=0, must-revalidate, max-age=0' );
 				} else {