X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FdoMaintenance.php;h=fe4905b2285bfa3b3592461c7f5d21d97b5ff452;hb=c3bb16690419f3c70ebba2839e0d18925c29effa;hp=0ee1e6a0b8b4320ffa999c3a45b3924535b2b5dc;hpb=f6a6b95dbdc8515fd45c41d36f8622b52af0e5d2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 0ee1e6a0b8..fe4905b228 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -99,12 +99,20 @@ try {
 	$success = $maintenance->execute();
 } catch ( Exception $ex ) {
 	$success = false;
+	$exReportMessage = '';
 	while ( $ex ) {
 		$cls = get_class( $ex );
-		print "$cls from line {$ex->getLine()} of {$ex->getFile()}: {$ex->getMessage()}\n";
-		print $ex->getTraceAsString() . "\n";
+		$exReportMessage .= "$cls from line {$ex->getLine()} of {$ex->getFile()}: {$ex->getMessage()}\n";
+		$exReportMessage .= $ex->getTraceAsString() . "\n";
 		$ex = $ex->getPrevious();
 	}
+	// Print the exception to stderr if possible, don't mix it in
+	// with stdout output.
+	if ( defined( 'STDERR' ) ) {
+		fwrite( STDERR, $exReportMessage );
+	} else {
+		echo $exReportMessage;
+	}
 }
 
 // Potentially debug globals