dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
977b5ea
)
Fixed MediaWiki dual getter/setters from fataling
author
Aaron Schulz
<aschulz@wikimedia.org>
Tue, 29 Jul 2014 22:31:58 +0000
(15:31 -0700)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Tue, 29 Jul 2014 22:31:58 +0000
(15:31 -0700)
Change-Id: I1361bbc0494dcf29b009f4684e57b10b488d1755
includes/MediaWiki.php
patch
|
blob
|
history
diff --git
a/includes/MediaWiki.php
b/includes/MediaWiki.php
index
81edc49
..
1b014f6
100644
(file)
--- 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;
}