From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 10 Feb 2010 10:49:17 +0000 (+0000)
Subject: Followup r62231, reduce code duplication in $request->response()
X-Git-Tag: 1.31.0-rc.0~37839
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=fd812c83f0dc5fd511dfe8e3835e42b60bf5e399;p=lhc%2Fweb%2Fwiklou.git

Followup r62231, reduce code duplication in $request->response()
---

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 6ae71ceb2d..903ea28f25 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -624,7 +624,8 @@ class WebRequest {
 	public function response() {
 		/* Lazy initialization of response object for this request */
 		if ( !is_object( $this->_response ) ) {
-			$this->_response = new WebResponse;
+			$class = ( $this instanceof FauxRequest ) ? 'FauxResponse' : 'WebResponse';
+			$this->_response = new $class();
 		}
 		return $this->_response;
 	}
@@ -779,12 +780,4 @@ class FauxRequest extends WebRequest {
 	public function isPathInfoBad() {
 		return false;
 	}
-
-	public function response() {
-		/* Lazy initialization of response object for this request */
-		if ( !is_object( $this->response ) ) {
-			$this->response = new FauxResponse;
-		}
-		return $this->response;
-	}
 }