Merge "Added result properties to action=paraminfo"

[lhc/web/wiklou.git] / includes / db / DatabaseError.php

diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index d7bfe93..53341c3 100644 (file)
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -1,4 +1,25 @@
 <?php
+/**
+ * This file contains database error classes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Database
+ */
 
 /**
  * Database error base class
@@ -82,6 +103,9 @@ class DBConnectionError extends DBError {
                parent::__construct( $db, $msg );
        }
 
+       /**
+        * @return bool
+        */
        function useOutputPage() {
                // Not likely to work
                return false;
@@ -105,6 +129,9 @@ class DBConnectionError extends DBError {
                return wfMsgReplaceArgs( $message, $args );
        }
 
+       /**
+        * @return bool
+        */
        function getLogMessage() {
                # Don't send to the exception log
                return false;
@@ -176,14 +203,14 @@ class DBConnectionError extends DBError {
                }
 
                # We can't, cough and die in the usual fashion
-               return parent::reportHTML();
+               parent::reportHTML();
        }
 
        /**
         * @return string
         */
        function searchForm() {
-               global $wgSitename, $wgServer, $wgRequest;
+               global $wgSitename, $wgCanonicalServer, $wgRequest;
 
                $usegoogle = htmlspecialchars( $this->msg( 'dberr-usegoogle', 'You can try searching via Google in the meantime.' ) );
                $outofdate = htmlspecialchars( $this->msg( 'dberr-outofdate', 'Note that their indexes of our content may be out of date.' ) );
@@ -191,14 +218,14 @@ class DBConnectionError extends DBError {
 
                $search = htmlspecialchars( $wgRequest->getVal( 'search' ) );
 
-               $server = htmlspecialchars( $wgServer );
+               $server = htmlspecialchars( $wgCanonicalServer );
                $sitename = htmlspecialchars( $wgSitename );
 
                $trygoogle = <<<EOT
 <div style="margin: 1.5em">$usegoogle<br />
 <small>$outofdate</small></div>
 <!-- SiteSearch Google -->
-<form method="get" action="http://www.google.com/search" id="googlesearch">
+<form method="get" action="//www.google.com/search" id="googlesearch">
        <input type="hidden" name="domains" value="$server" />
        <input type="hidden" name="num" value="50" />
        <input type="hidden" name="ie" value="UTF-8" />
@@ -223,7 +250,7 @@ EOT;
                global $wgTitle, $wgOut, $wgRequest;
 
                if ( $wgOut->isDisabled() ) {
-                       return; // Done already?
+                       return ''; // Done already?
                }
 
                if ( $wgTitle ) { // use $wgTitle if we managed to set it
@@ -254,15 +281,18 @@ EOT;
 class DBQueryError extends DBError {
        public $error, $errno, $sql, $fname;
 
+       /**
+        * @param $db DatabaseBase
+        * @param $error string
+        * @param $errno int|string
+        * @param $sql string
+        * @param $fname string
+        */
        function __construct( DatabaseBase &$db, $error, $errno, $sql, $fname ) {
-               $message = "A database error has occurred.  Did you forget to run maintenance/update.php after upgrading?  See: http://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" .
+               $message = "A database error has occurred.  Did you forget to run maintenance/update.php after upgrading?  See: https://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" .
                  "Query: $sql\n" .
                  "Function: $fname\n" .
                  "Error: $errno $error\n";
-               global $wgShowDBErrorBacktrace;
-               if( $wgShowDBErrorBacktrace ) {
-                       $message .= $this->getTraceAsString();
-               }
                parent::__construct( $db, $message );
 
                $this->error = $error;
@@ -307,6 +337,9 @@ class DBQueryError extends DBError {
                }
        }
 
+       /**
+        * @return bool
+        */
        function getLogMessage() {
                # Don't send to the exception log
                return false;