Merge "Consistently follow conventions for documenting parameters"

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

index 21952bb..dc1208a 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -333,7 +333,7 @@ class ErrorPageError extends MWException {
                 // customized by the local wiki. So get the default English version for
                 // passing to the parent constructor. Our overridden report() below
                 // makes sure that the page shown to the user is not forced to English.
-               if( $msg instanceof Message ) {
+               if ( $msg instanceof Message ) {
                         $enMsg = clone( $msg );
                 } else {
                         $enMsg = wfMessage( $msg, $params );
@@ -467,39 +467,9 @@ class ThrottledError extends ErrorPageError {
   */
  class UserBlockedError extends ErrorPageError {
         public function __construct( Block $block ) {
-               global $wgLang, $wgRequest;
-
-               $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 == '' ) {
-                       $reason = wfMessage( 'blockednoreason' )->text();
-               }
-
-               /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked.
-                * This could be a username, an IP range, or a single IP. */
-               $intended = $block->getTarget();
-
-               parent::__construct(
-                       'blockedtitle',
-                       $block->mAuto ? 'autoblockedtext' : 'blockedtext',
-                       array(
-                               $link,
-                               $reason,
-                               $wgRequest->getIP(),
-                               $block->getByName(),
-                               $block->getId(),
-                               $wgLang->formatExpiry( $block->mExpiry ),
-                               $intended,
-                               $wgLang->timeanddate( wfTimestamp( TS_MW, $block->mTimestamp ), true )
-                       )
-               );
+               // @todo FIXME: Implement a more proper way to get context here.
+               $params = $block->getPermissionsError( RequestContext::getMain() );
+               parent::__construct( 'blockedtitle', array_shift( $params ), $params );
         }
  }
  
@@ -617,7 +587,7 @@ class HttpError extends MWException {
                         $content = htmlspecialchars( $this->content );
                 }
  
-               return "<!DOCTYPE html>\n".
+               return "<!DOCTYPE html>\n" .
                         "<html><head><title>$header</title></head>\n" .
                         "<body><h1>$header</h1><p>$content</p></body></html>\n";
         }
@@ -698,7 +668,7 @@ class MWExceptionHandler {
                 if ( defined( 'STDERR' ) ) {
                         fwrite( STDERR, $message );
                 } else {
-                       echo( $message );
+                       echo $message;
                 }
         }
  
@@ -721,8 +691,10 @@ class MWExceptionHandler {
                 // Final cleanup
                 if ( $wgFullyInitialised ) {
                         try {
-                               wfLogProfilingData(); // uses $wgRequest, hence the $wgFullyInitialised condition
-                       } catch ( Exception $e ) {}
+                               // uses $wgRequest, hence the $wgFullyInitialised condition
+                               wfLogProfilingData();
+                       } catch ( Exception $e ) {
+                       }
                 }
  
                 // Exit value should be nonzero for the benefit of shell jobs