From 0a61ebd1d7d0ffb254063ad8470d1a124ab21e1e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 29 Jul 2014 15:31:58 -0700 Subject: [PATCH] Fixed MediaWiki dual getter/setters from fataling Change-Id: I1361bbc0494dcf29b009f4684e57b10b488d1755 --- includes/MediaWiki.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; } -- 2.20.1