Another artefact of the disable account merge

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

diff --git a/includes/Exception.php b/includes/Exception.php
index 432b768..08a63ee 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -53,7 +53,7 @@ class MWException extends Exception {
                global $wgExceptionHooks;
 
                if ( !isset( $wgExceptionHooks ) || !is_array( $wgExceptionHooks ) ) {
-                       return; // Just silently ignore
+                       return; // Just silently ignore
                }
 
                if ( !array_key_exists( $name, $wgExceptionHooks ) || !is_array( $wgExceptionHooks[ $name ] ) ) {
@@ -70,8 +70,9 @@ class MWException extends Exception {
                                $result = null;
                        }
 
-                       if ( is_string( $result ) )
+                       if ( is_string( $result ) ) {
                                return $result;
+                       }
                }
        }
 
@@ -118,6 +119,7 @@ class MWException extends Exception {
        /**
         * If $wgShowExceptionDetails is true, return a text message with a
         * backtrace to the error.
+        * @return string
         */
        function getText() {
                global $wgShowExceptionDetails;
@@ -131,10 +133,12 @@ class MWException extends Exception {
                }
        }
 
-       /* Return titles of this error page */
+       /**
+        * Return titles of this error page
+        * @return String
+        */
        function getPageTitle() {
-               global $wgSitename;
-               return $this->msg( 'internalerror', "$wgSitename error" );
+               return $this->msg( 'internalerror', "Internal error" );
        }
 
        /**
@@ -166,12 +170,7 @@ class MWException extends Exception {
        function reportHTML() {
                global $wgOut;
                if ( $this->useOutputPage() ) {
-                       $wgOut->setPageTitle( $this->getPageTitle() );
-                       $wgOut->setRobotPolicy( "noindex,nofollow" );
-                       $wgOut->setArticleRelated( false );
-                       $wgOut->enableClientCache( false );
-                       $wgOut->redirect( '' );
-                       $wgOut->clearHTML();
+                       $wgOut->prepareErrorPage( $this->getPageTitle() );
 
                        $hookResult = $this->runHooks( get_class( $this ) );
                        if ( $hookResult ) {
@@ -182,6 +181,7 @@ class MWException extends Exception {
 
                        $wgOut->output();
                } else {
+                       header( "Content-Type: text/html; charset=utf-8" );
                        $hookResult = $this->runHooks( get_class( $this ) . "Raw" );
                        if ( $hookResult ) {
                                die( $hookResult );
@@ -210,6 +210,10 @@ class MWException extends Exception {
                }
        }
 
+       /**
+        * @static
+        * @return bool
+        */
        static function isCommandLine() {
                return !empty( $GLOBALS['wgCommandLineMode'] );
        }
@@ -221,10 +225,17 @@ class MWException extends Exception {
  * @ingroup Exception
  */
 class FatalError extends MWException {
+
+       /**
+        * @return string
+        */
        function getHTML() {
                return $this->getMessage();
        }
 
+       /**
+        * @return string
+        */
        function getText() {
                return $this->getMessage();
        }
@@ -266,33 +277,34 @@ class ErrorPageError extends MWException {
  * @ingroup Exception
  */
 class PermissionsError extends ErrorPageError {
-       public $permission;
+       public $permission, $errors;
 
-       function __construct( $permission ) {
+       function __construct( $permission, $errors = array() ) {
                global $wgLang;
 
                $this->permission = $permission;
 
-               $groups = array_map(
-                       array( 'User', 'makeGroupLinkWiki' ),
-                       User::getGroupsWithPermission( $this->permission )
-               );
-
-               if( $groups ) {
-                       parent::__construct(
-                               'badaccess',
-                               'badaccess-groups',
-                               array(
-                                       $wgLang->commaList( $groups ),
-                                       count( $groups )
-                               )
-                       );
-               } else {
-                       parent::__construct(
-                               'badaccess',
-                               'badaccess-group0'
+               if ( !count( $errors ) ) {
+                       $groups = array_map(
+                               array( 'User', 'makeGroupLinkWiki' ),
+                               User::getGroupsWithPermission( $this->permission )
                        );
+
+                       if ( $groups ) {
+                               $errors[] = array( 'badaccess-groups', $wgLang->commaList( $groups ), count( $groups ) );
+                       } else {
+                               $errors[] = array( 'badaccess-group0' );
+                       }
                }
+
+               $this->errors = $errors;
+       }
+
+       function report() {
+               global $wgOut;
+
+               $wgOut->showPermissionsErrorPage( $this->errors, $this->permission );
+               $wgOut->output();
        }
 }
 
@@ -322,6 +334,7 @@ class ThrottledError extends ErrorPageError {
                        'actionthrottledtext'
                );
        }
+
        public function report(){
                global $wgOut;
                $wgOut->setStatusCode( 503 );
@@ -337,8 +350,13 @@ class UserBlockedError extends ErrorPageError {
        public function __construct( Block $block ){
                global $wgLang, $wgRequest;
 
-               $blockerUserpage = $block->getBlocker()->getUserPage();
-               $link = "[[{$blockerUserpage->getPrefixedText()}|{$blockerUserpage->getText()}]]";
+               $blocker = $block->getBlocker();
+               if ( $blocker instanceof User ) { // local user
+                       $blockerUserpage = $block->getBlocker()->getUserPage();
+                       $link = "[[{$blockerUserpage->getPrefixedText()}|{$blockerUserpage->getText()}]]";
+               } else { // foreign user
+                       $link = $blocker;
+               }
 
                $reason = $block->mReason;
                if( $reason == '' ) {
@@ -356,7 +374,7 @@ class UserBlockedError extends ErrorPageError {
                                $link,
                                $reason,
                                $wgRequest->getIP(),
-                               $block->getBlocker()->getName(),
+                               $block->getByName(),
                                $block->getId(),
                                $wgLang->formatExpiry( $block->mExpiry ),
                                $intended,