dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vastly increase how long wfWaitForSlaves() can block in CLI mode
[lhc/web/wiklou.git]
/
includes
/
MediaWiki.php
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();
*/
public function request( WebRequest $x = null ) {
$old = $this->context->getRequest();
- $this->context->setRequest( $x );
+ if ( $x ) {
+ $this->context->setRequest( $x );
+ }
return $old;
}
return $old;
}
@@
-48,7
+50,9
@@
class MediaWiki {
*/
public function output( OutputPage $x = null ) {
$old = $this->context->getOutput();
*/
public function output( OutputPage $x = null ) {
$old = $this->context->getOutput();
- $this->context->setOutput( $x );
+ if ( $x ) {
+ $this->context->setOutput( $x );
+ }
return $old;
}
return $old;
}