dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
7ce640b
)
Merge "Fix maintenance script failure when run as a child of a FastCGI worker"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Dec 2017 05:13:15 +0000
(
05:13
+0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Fri, 8 Dec 2017 05:13:15 +0000
(
05:13
+0000)
maintenance/Maintenance.php
patch
|
blob
|
history
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
255892b
..
a3e0ffd
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-662,7
+662,7
@@
abstract class Maintenance {
global $IP, $wgCommandLineMode, $wgRequestTime;
# Abort if called from a web server
- if (
isset( $_SERVER ) && isset( $_SERVER['REQUEST_METHOD'] )
) {
+ if (
PHP_SAPI !== 'cli'
) {
$this->fatalError( 'This script must be run from the command line' );
}