X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=blobdiff_plain;f=maintenance%2FMaintenance.php;h=68c51a8839ea48e1d15dee63f88b975e046ad04e;hb=251a0b97e5bb8711bac1784e90f9b7d61377e7da;hp=07f547f48abc5c5f573ffa11e7fc72ad39bf45cb;hpb=949592012ea0bb73f6e2395551896919ad052abd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f48a..68c51a8839 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -410,7 +410,7 @@ abstract class Maintenance {
 			$this->fatalError( $err, intval( $die ) );
 		}
 		$this->outputChanneled( false );
-		if ( PHP_SAPI == 'cli' ) {
+		if ( PHP_SAPI == 'cli' || PHP_SAPI == 'phpdbg' ) {
 			fwrite( STDERR, $err . "\n" );
 		} else {
 			print $err;
@@ -672,7 +672,8 @@ abstract class Maintenance {
 		global $IP, $wgCommandLineMode, $wgRequestTime;
 
 		# Abort if called from a web server
-		if ( PHP_SAPI !== 'cli' ) {
+		# wfIsCLI() is not available yet
+		if ( PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg' ) {
 			$this->fatalError( 'This script must be run from the command line' );
 		}