Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150415

Change subject: Fixed MediaWiki dual getter/setters from fataling
......................................................................

Fixed MediaWiki dual getter/setters from fataling

Change-Id: I1361bbc0494dcf29b009f4684e57b10b488d1755
---
M includes/MediaWiki.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/150415/1

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 81edc49..1b014f6 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -38,7 +38,9 @@
         */
        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 @@
         */
        public function output( OutputPage $x = null ) {
                $old = $this->context->getOutput();
-               $this->context->setOutput( $x );
+               if ( $x ) {
+                       $this->context->setOutput( $x );
+               }
                return $old;
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1361bbc0494dcf29b009f4684e57b10b488d1755
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to