* API: (bug 20700) Add amprop=default to list default messages in list=allmessages...

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

diff --git a/includes/Exception.php b/includes/Exception.php
index 34671ff..f6bc6f8 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -8,13 +8,13 @@
  * @ingroup Exception
  */
 class MWException extends Exception {
-
        /**
         * Should the exception use $wgOut to output the error ?
         * @return bool
         */
        function useOutputPage() {
-               return !empty( $GLOBALS['wgFullyInitialised'] ) &&
+               return $this->useMessageCache() &&
+                       !empty( $GLOBALS['wgFullyInitialised'] ) &&
                        ( !empty( $GLOBALS['wgArticle'] ) || ( !empty( $GLOBALS['wgOut'] ) && !$GLOBALS['wgOut']->isArticle() ) ) &&
                        !empty( $GLOBALS['wgTitle'] );
        }
@@ -25,6 +25,11 @@ class MWException extends Exception {
         */
        function useMessageCache() {
                global $wgLang;
+               foreach ( $this->getTrace() as $frame ) {
+                       if ( isset( $frame['class'] ) && $frame['class'] === 'LocalisationCache' ) {
+                               return false;
+                       }
+               }
                return is_object( $wgLang );
        }
 
@@ -83,7 +88,7 @@ class MWException extends Exception {
        function getHTML() {
                global $wgShowExceptionDetails;
                if( $wgShowExceptionDetails ) {
-                       return '<p>' . htmlspecialchars( $this->getMessage() ) .
+                       return '<p>' . nl2br( htmlspecialchars( $this->getMessage() ) ) .
                                '</p><p>Backtrace:</p><p>' . nl2br( htmlspecialchars( $this->getTraceAsString() ) ) .
                                "</p>\n";
                } else {
@@ -129,7 +134,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 +166,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' ) || $this->htmlBodyOnly() ) {
+                               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();
                }
@@ -190,12 +207,12 @@ class MWException extends Exception {
                        header( 'Pragma: nocache' );
                }
                $title = $this->getPageTitle();
-               echo "<html>
+               return "<html>
                <head>
                <title>$title</title>
                </head>
                <body>
-               <h1><img src='$wgLogo' style='float:left;margin-right:1em' alt=''>$title</h1>
+               <h1><img src='$wgLogo' style='float:left;margin-right:1em' alt=''/>$title</h1>
                ";
        }
 
@@ -203,7 +220,18 @@ class MWException extends Exception {
         * print the end of the html page if not using $wgOut.
         */
        function htmlFooter() {
-               echo "</body></html>";
+               return "</body></html>";
+       }
+       
+       /**
+        * headers handled by subclass?
+        */
+       function htmlBodyOnly() {
+               return false;
+       }
+
+       static function isCommandLine() {
+               return !empty( $GLOBALS['wgCommandLineMode'] ) && !defined( 'MEDIAWIKI_INSTALL' );
        }
 }
 
@@ -255,27 +283,53 @@ function wfInstallExceptionHandler() {
  * Report an exception to the user
  */
 function wfReportException( Exception $e ) {
-        if ( $e instanceof MWException ) {
-                try {
-                        $e->report();
-                } catch ( Exception $e2 ) {
-                        // Exception occurred from within exception handler
-                        // Show a simpler error message for the original exception,
-                        // don't try to invoke report()
-                        $message = "MediaWiki internal error.\n\n" .
-                        "Original exception: " . $e->__toString() .
-                        "\n\nException caught inside exception handler: " .
-                        $e2->__toString() . "\n";
+       $cmdLine = MWException::isCommandLine();
+       if ( $e instanceof MWException ) {
+               try {
+                       $e->report();
+               } catch ( Exception $e2 ) {
+                       // Exception occurred from within exception handler
+                       // Show a simpler error message for the original exception,
+                       // don't try to invoke report()
+                       $message = "MediaWiki internal error.\n\n";
+                       if ( $GLOBALS['wgShowExceptionDetails'] )
+                               $message .= "Original exception: " . $e->__toString();
+                       $message .= "\n\nException caught inside exception handler";
+                       if ( $GLOBALS['wgShowExceptionDetails'] )
+                               $message .= ": " . $e2->__toString();
+                       $message .= "\n";
+                       if ( $cmdLine ) {
+                               wfPrintError( $message );
+                       } else {
+                               echo nl2br( htmlspecialchars( $message ) ). "\n";
+                       }
+               }
+       } else {
+               $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";
+               }
+       }
+}
 
-                        if ( !empty( $GLOBALS['wgCommandLineMode'] ) ) {
-                                fwrite( STDERR, $message );
-                        } else {
-                                echo nl2br( htmlspecialchars( $message ) ). "\n";
-                        }
-                }
-        } else {
-                echo $e->__toString();
-        }
+/**
+ * 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 );
+       }
 }
 
 /**