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
Merge "Show a warning in edit preview when a template loop is detected"
[lhc/web/wiklou.git]
/
includes
/
exception
/
ErrorPageError.php
diff --git
a/includes/exception/ErrorPageError.php
b/includes/exception/ErrorPageError.php
index
2bed87a
..
4b18126
100644
(file)
--- a/
includes/exception/ErrorPageError.php
+++ b/
includes/exception/ErrorPageError.php
@@
-61,9
+61,12
@@
class ErrorPageError extends MWException implements ILocalizedException {
}
public function report() {
}
public function report() {
- global $wgOut;
-
- $wgOut->showErrorPage( $this->title, $this->msg, $this->params );
- $wgOut->output();
+ if ( self::isCommandLine() || defined( 'MW_API' ) ) {
+ parent::report();
+ } else {
+ global $wgOut;
+ $wgOut->showErrorPage( $this->title, $this->msg, $this->params );
+ $wgOut->output();
+ }
}
}
}
}