Merge "Add SPARQL client to core"

[lhc/web/wiklou.git] / includes / exception / MWException.php
diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php

index 4ff8636..16f226c 100644 (file)
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -55,7 +55,7 @@ class MWException extends Exception {
                 global $wgLang;
  
                 foreach ( $this->getTrace() as $frame ) {
-                       if ( isset( $frame['class'] ) && $frame['class'] === 'LocalisationCache' ) {
+                       if ( isset( $frame['class'] ) && $frame['class'] === LocalisationCache::class ) {
                                 return false;
                         }
                 }
@@ -63,17 +63,6 @@ class MWException extends Exception {
                 return $wgLang instanceof Language;
         }
  
-       /**
-        * Run hook to allow extensions to modify the text of the exception
-        *
-        * @param string $name Class name of the exception
-        * @param array $args Arguments to pass to the callback functions
-        * @return string|null String to output or null if any hook has been called
-        */
-       public function runHooks( $name, $args = [] ) {
-               return MWExceptionRenderer::runHooks( $this, $name, $args );
-       }
-
         /**
          * Get a message from i18n
          *
@@ -113,15 +102,17 @@ class MWException extends Exception {
                 } else {
                         $logId = WebRequest::getRequestId();
                         $type = static::class;
-                       return "<div class=\"errorbox\">" .
-                       '[' . $logId . '] ' .
-                       gmdate( 'Y-m-d H:i:s' ) . ": " .
-                       $this->msg( "internalerror-fatal-exception",
-                               "Fatal exception of type $1",
-                               $type,
-                               $logId,
-                               MWExceptionHandler::getURL( $this )
-                       ) . "</div>\n" .
+                       return Html::errorBox(
+                       htmlspecialchars(
+                               '[' . $logId . '] ' .
+                               gmdate( 'Y-m-d H:i:s' ) . ": " .
+                               $this->msg( "internalerror-fatal-exception",
+                                       "Fatal exception of type $1",
+                                       $type,
+                                       $logId,
+                                       MWExceptionHandler::getURL( $this )
+                               )
+                       ) ) .
                         "<!-- Set \$wgShowExceptionDetails = true; " .
                         "at the bottom of LocalSettings.php to show detailed " .
                         "debugging information. -->";
@@ -164,12 +155,7 @@ class MWException extends Exception {
                 if ( $this->useOutputPage() ) {
                         $wgOut->prepareErrorPage( $this->getPageTitle() );
  
-                       $hookResult = $this->runHooks( static::class );
-                       if ( $hookResult ) {
-                               $wgOut->addHTML( $hookResult );
-                       } else {
-                               $wgOut->addHTML( $this->getHTML() );
-                       }
+                       $wgOut->addHTML( $this->getHTML() );
  
                         $wgOut->output();
                 } else {
@@ -183,12 +169,7 @@ class MWException extends Exception {
                                 '<style>body { font-family: sans-serif; margin: 0; padding: 0.5em 2em; }</style>' .
                                 "</head><body>\n";
  
-                       $hookResult = $this->runHooks( static::class . 'Raw' );
-                       if ( $hookResult ) {
-                               echo $hookResult;
-                       } else {
-                               echo $this->getHTML();
-                       }
+                       echo $this->getHTML();
  
                         echo "</body></html>\n";
                 }