From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 29 Jul 2014 22:31:58 +0000 (-0700)
Subject: Fixed MediaWiki dual getter/setters from fataling
X-Git-Tag: 1.31.0-rc.0~14669^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=0a61ebd1d7d0ffb254063ad8470d1a124ab21e1e;p=lhc%2Fweb%2Fwiklou.git

Fixed MediaWiki dual getter/setters from fataling

Change-Id: I1361bbc0494dcf29b009f4684e57b10b488d1755
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 81edc4980a..1b014f6f64 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -38,7 +38,9 @@ class MediaWiki {
 	 */
 	public function request( WebRequest $x = null ) {
 		$old = $this->context->getRequest();
-		$this->context->setRequest( $x );
+		if ( $x ) {
+			$this->context->setRequest( $x );
+		}
 		return $old;
 	}
 
@@ -48,7 +50,9 @@ class MediaWiki {
 	 */
 	public function output( OutputPage $x = null ) {
 		$old = $this->context->getOutput();
-		$this->context->setOutput( $x );
+		if ( $x ) {
+			$this->context->setOutput( $x );
+		}
 		return $old;
 	}