* Add wfReadOnlyReason() to supply the reason for the wiki being read only. Use it...

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

diff --git a/includes/Exception.php b/includes/Exception.php
index 1ae28de..2fd5435 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -16,6 +16,26 @@ class MWException extends Exception
                return is_object( $wgLang );
        }
 
+       function runHooks( $name, $args = array() ) {
+               global $wgExceptionHooks;
+               if( !isset( $wgExceptionHooks ) || !is_array( $wgExceptionHooks ) ) 
+                       return; // Just silently ignore
+               if( !array_key_exists( $name, $wgExceptionHooks ) || !is_array( $wgExceptionHooks[ $name ] ) )
+                       return;
+               $hooks = $wgExceptionHooks[ $name ];
+               $callargs = array_merge( array( $this ), $args );
+
+               foreach( $hooks as $hook ) {
+                       if( is_string( $hook ) || ( is_array( $hook ) && count( $hook ) >= 2 && is_string( $hook[0] ) ) ) {     //'function' or array( 'class', hook' )
+                               $result = call_user_func_array( $hook, $callargs );
+                       } else {
+                               $result = null;
+                       }
+                       if( is_string( $result ) )
+                               return $result;
+               }
+       }
+
        /** Get a message from i18n */
        function msg( $key, $fallback /*[, params...] */ ) {
                $args = array_slice( func_get_args(), 2 );
@@ -83,27 +103,29 @@ class MWException extends Exception
                        $wgOut->enableClientCache( false );
                        $wgOut->redirect( '' );
                        $wgOut->clearHTML();
-                       $wgOut->addHTML( $this->getHTML() );
+                       if( $hookResult = $this->runHooks( get_class( $this ) ) ) {
+                               $wgOut->addHTML( $hookResult );
+                       } else {
+                               $wgOut->addHTML( $this->getHTML() );
+                       }
                        $wgOut->output();
                } else {
+                       if( $hookResult = $this->runHooks( get_class( $this ) . "Raw" ) ) {
+                               die( $hookResult );
+                       }
                        echo $this->htmlHeader();
                        echo $this->getHTML();
                        echo $this->htmlFooter();
                }
        }
 
-       /** Print the exception report using text */
-       function reportText() {
-               fwrite( STDERR, $this->getText() );
-       }
-
        /* Output a report about the exception and takes care of formatting.
         * It will be either HTML or plain text based on $wgCommandLineMode.
         */
        function report() {
                global $wgCommandLineMode;
                if ( $wgCommandLineMode ) {
-                       $this->reportText();
+                       fwrite( STDERR, $this->getText() );
                } else {
                        $log = $this->getLogMessage();
                        if ( $log ) {
@@ -136,7 +158,6 @@ class MWException extends Exception
        function htmlFooter() {
                echo "</body></html>";
        }
-
 }
 
 /**