For backport to 1.14.

[lhc/web/wiklou.git] / includes / Exception.php

diff --git a/includes/Exception.php b/includes/Exception.php
index 5aa9ba5..b71a07b 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -129,7 +129,16 @@ class MWException extends Exception {
                $file = $this->getFile();
                $line = $this->getLine();
                $message = $this->getMessage();
-               return $wgRequest->getRequestURL() . " Exception from line $line of $file: $message";
+               if ( isset( $wgRequest ) ) {
+                       $url = $wgRequest->getRequestURL();
+                       if ( !$url ) {
+                               $url = '[no URL]';
+                       }
+               } else {
+                       $url = '[no req]';
+               }
+
+               return "$url   Exception from line $line of $file: $message";
        }
 
        /** Output the exception report using HTML */
@@ -152,24 +161,27 @@ class MWException extends Exception {
                        if( $hookResult = $this->runHooks( get_class( $this ) . "Raw" ) ) {
                                die( $hookResult );
                        }
-                       echo $this->htmlHeader();
-                       echo $this->getHTML();
-                       echo $this->htmlFooter();
+                       if ( defined( 'MEDIAWIKI_INSTALL' ) ) {
+                               echo $this->getHTML();
+                       } else {
+                               echo $this->htmlHeader();
+                               echo $this->getHTML();
+                               echo $this->htmlFooter();
+                       }
                }
        }
 
        /**
         * Output a report about the exception and takes care of formatting.
-        * It will be either HTML or plain text based on $wgCommandLineMode.
+        * It will be either HTML or plain text based on isCommandLine().
         */
        function report() {
-               global $wgCommandLineMode;
                $log = $this->getLogMessage();
                if ( $log ) {
                        wfDebugLog( 'exception', $log );
                }
-               if ( $wgCommandLineMode ) {
-                       fwrite( STDERR, $this->getText() );
+               if ( self::isCommandLine() ) {
+                       wfPrintError( $this->getText() );
                } else {
                        $this->reportHTML();
                }
@@ -205,6 +217,10 @@ class MWException extends Exception {
        function htmlFooter() {
                echo "</body></html>";
        }
+
+       static function isCommandLine() {
+               return !empty( $GLOBALS['wgCommandLineMode'] ) && !defined( 'MEDIAWIKI_INSTALL' );
+       }
 }
 
 /**
@@ -255,6 +271,7 @@ function wfInstallExceptionHandler() {
  * Report an exception to the user
  */
 function wfReportException( Exception $e ) {
+       $cmdLine = MWException::isCommandLine();
         if ( $e instanceof MWException ) {
                 try {
                         $e->report();
@@ -267,17 +284,41 @@ function wfReportException( Exception $e ) {
                         "\n\nException caught inside exception handler: " .
                         $e2->__toString() . "\n";
 
-                        if ( !empty( $GLOBALS['wgCommandLineMode'] ) ) {
-                                fwrite( STDERR, $message );
+                        if ( $cmdLine ) {
+                                wfPrintError( $message );
                         } else {
                                 echo nl2br( htmlspecialchars( $message ) ). "\n";
                         }
                 }
         } else {
-                echo $e->__toString();
+                $message = "Unexpected non-MediaWiki exception encountered, of type \"" . get_class( $e ) . "\"\n" .
+                        $e->__toString() . "\n";
+                if ( $GLOBALS['wgShowExceptionDetails'] ) {
+                        $message .= "\n" . $e->getTraceAsString() ."\n";
+                }
+                if ( $cmdLine ) {
+                        wfPrintError( $message );
+                } else {
+                        echo nl2br( htmlspecialchars( $message ) ). "\n";
+                }
         }
 }
 
+/**
+ * Print a message, if possible to STDERR.
+ * Use this in command line mode only (see isCommandLine)
+ */
+function wfPrintError( $message ) {
+       #NOTE: STDERR may not be available, especially if php-cgi is used from the command line (bug #15602).
+       #      Try to produce meaningful output anyway. Using echo may corrupt output to STDOUT though.
+       if ( defined( 'STDERR' ) ) {
+               fwrite( STDERR, $message );
+       }
+       else {
+               echo( $message );
+       }
+}
+
 /**
  * Exception handler which simulates the appropriate catch() handling:
  *