Update Postgres with missing uploadstash tables

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

index f380d5d..b1e788f 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;
+                       }
                 }
         }
  
@@ -131,7 +132,10 @@ 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" );
@@ -150,7 +154,7 @@ class MWException extends Exception {
                 $line = $this->getLine();
                 $message = $this->getMessage();
  
-               if ( isset( $wgRequest ) ) {
+               if ( isset( $wgRequest ) && !$wgRequest instanceof FauxRequest ) {
                         $url = $wgRequest->getRequestURL();
                         if ( !$url ) {
                                 $url = '[no URL]';
@@ -366,6 +370,55 @@ class UserBlockedError extends ErrorPageError {
         }
  }
  
+/**
+ * Show an error that looks like an HTTP server error.
+ * Replacement for wfHttpError().
+ *
+ * @ingroup Exception
+ */
+class HttpError extends MWException {
+       private $httpCode, $header, $content;
+
+       /**
+        * Constructor
+        *
+        * @param $httpCode Integer: HTTP status code to send to the client
+        * @param $content String|Message: content of the message
+        * @param $header String|Message: content of the header (\<title\> and \<h1\>)
+        */
+       public function __construct( $httpCode, $content, $header = null ){
+               parent::__construct( $content );
+               $this->httpCode = (int)$httpCode;
+               $this->header = $header;
+               $this->content = $content;
+       }
+
+       public function reportHTML() {
+               $httpMessage = HttpStatus::getMessage( $this->httpCode );
+
+               header( "Status: {$this->httpCode} {$httpMessage}" );
+               header( 'Content-type: text/html; charset=utf-8' );
+
+               if ( $this->header === null ) {
+                       $header = $httpMessage;
+               } elseif ( $this->header instanceof Message ) {
+                       $header = $this->header->escaped();
+               } else {
+                       $header = htmlspecialchars( $this->header );
+               }
+
+               if ( $this->content instanceof Message ) {
+                       $content = $this->content->escaped();
+               } else {
+                       $content = htmlspecialchars( $this->content );
+               }
+
+               print "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n".
+                       "<html><head><title>$header</title></head>\n" .
+                       "<body><h1>$header</h1><p>$content</p></body></html>\n";
+       }
+}
+
  /**
   * Handler class for MWExceptions
   * @ingroup Exception