dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* (bug 20336) changed json_decode json_encode to static class in global functions
[lhc/web/wiklou.git] / includes / Exception.php
diff --git a/includes/Exception.php b/includes/Exception.php
index 2ccdcc9..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 );
        }
 
@@ -161,7 +166,7 @@ class MWException extends Exception {
                        if( $hookResult = $this->runHooks( get_class( $this ) . "Raw" ) ) {
                                die( $hookResult );
                        }
-                       if ( defined( 'MEDIAWIKI_INSTALL' ) ) {
+                       if ( defined( 'MEDIAWIKI_INSTALL' ) || $this->htmlBodyOnly() ) {
                                echo $this->getHTML();
                        } else {
                                echo $this->htmlHeader();
@@ -202,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>
                ";
        }
 
@@ -215,7 +220,14 @@ 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() {
@@ -273,37 +285,37 @@ function wfInstallExceptionHandler() {
 function wfReportException( Exception $e ) {
        $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";
+               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";
-                       }
                }
-       } 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";
-                }
-        }
+       }
 }
 
 /**
@@ -315,8 +327,7 @@ function wfPrintError( $message ) {
        #      Try to produce meaningful output anyway. Using echo may corrupt output to STDOUT though.
        if ( defined( 'STDERR' ) ) {
                fwrite( STDERR, $message );
-       }
-       else {
+       } else {
                echo( $message );
        }
 }
Wiklou, le Wiki du Wiklou