jenkins-bot has submitted this change and it was merged.
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(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
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: merged
Gerrit-Change-Id: I1361bbc0494dcf29b009f4684e57b10b488d1755
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
