From: Timo Tijhof <ttijhof@wikimedia.org>
Date: Tue, 5 Jun 2012 17:47:17 +0000 (+0200)
Subject: (bug 37138) Fix broken Google sitesearch in DatabaseError
X-Git-Tag: 1.31.0-rc.0~23384^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=3b073fa3562649e6b16503b7e352741b65c0d63a;p=lhc%2Fweb%2Fwiklou.git

(bug 37138) Fix broken Google sitesearch in DatabaseError

Change-Id: I31dc64f83ce8767dcdd84597844b0819840f60e1
---

diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 6aed05cec1..53341c32e4 100644
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -210,7 +210,7 @@ class DBConnectionError extends DBError {
 	 * @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.' ) );
@@ -218,7 +218,7 @@ class DBConnectionError extends DBError {
 
 		$search = htmlspecialchars( $wgRequest->getVal( 'search' ) );
 
-		$server = htmlspecialchars( $wgServer );
+		$server = htmlspecialchars( $wgCanonicalServer );
 		$sitename = htmlspecialchars( $wgSitename );
 
 		$trygoogle = <<<EOT