Revert 40741. Causes "Division by zero in includes/LinksUpdate.php on line 210"

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

diff --git a/includes/Exception.php b/includes/Exception.php
index 3fea288..5aa9ba5 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -1,8 +1,11 @@
 <?php
+/**
+ * @defgroup Exception Exception
+ */
 
 /**
  * MediaWiki exception
- * @addtogroup Exception
+ * @ingroup Exception
  */
 class MWException extends Exception {
 
@@ -80,7 +83,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 {
@@ -134,7 +137,7 @@ class MWException extends Exception {
                global $wgOut;
                if ( $this->useOutputPage() ) {
                        $wgOut->setPageTitle( $this->getPageTitle() );
-                       $wgOut->setRobotpolicy( "noindex,nofollow" );
+                       $wgOut->setRobotPolicy( "noindex,nofollow" );
                        $wgOut->setArticleRelated( false );
                        $wgOut->enableClientCache( false );
                        $wgOut->redirect( '' );
@@ -161,13 +164,13 @@ class MWException extends Exception {
         */
        function report() {
                global $wgCommandLineMode;
+               $log = $this->getLogMessage();
+               if ( $log ) {
+                       wfDebugLog( 'exception', $log );
+               }
                if ( $wgCommandLineMode ) {
                        fwrite( STDERR, $this->getText() );
                } else {
-                       $log = $this->getLogMessage();
-                       if ( $log ) {
-                               wfDebugLog( 'exception', $log );
-                       }
                        $this->reportHTML();
                }
        }
@@ -207,7 +210,7 @@ class MWException extends Exception {
 /**
  * Exception class which takes an HTML error message, and does not
  * produce a backtrace. Replacement for OutputPage::fatalError().
- * @addtogroup Exception
+ * @ingroup Exception
  */
 class FatalError extends MWException {
        function getHTML() {
@@ -220,7 +223,7 @@ class FatalError extends MWException {
 }
 
 /**
- * @addtogroup Exception
+ * @ingroup Exception
  */
 class ErrorPageError extends MWException {
        public $title, $msg;