From: Juan Osorio <osorio.juan@microsoft.com>
Date: Fri, 9 Nov 2018 22:45:55 +0000 (-0800)
Subject: Removes Google web search from exception page
X-Git-Tag: 1.31.2~41
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=0e339243f1dbbba5f87a54b116c23e0daec8e2e4

Removes Google web search from exception page

When a wiki is down, it is not necessarily useful to be able to
search the web. Additionally, there is general consensus that
the hard-coded Google search form should be removed.

Bug: T208871
Change-Id: I5bcae848de1144d4fc1116c475b2e2ab1ccc3f7d
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index a8cc7600f9..5594503eed 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -52,6 +52,8 @@ THIS IS NOT A RELEASE YET
 * (T210621) User: Bypass repeatable-read when creating an actor_id.
 * (T204531) rdbms: reduce LoadBalancer replication log spam.
 * (T195525) Fix db error outage page.
+* (T208871) The hard-coded Google search form on the database error page was
+  removed.
 
 == MediaWiki 1.31.1 ==
 
diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index 88b28df385..5d75036566 100644
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -332,47 +332,7 @@ class MWExceptionRenderer {
 				htmlspecialchars( $e->getTraceAsString() ) . '</pre>';
 		}
 
-		$html .= '<hr />';
-		$html .= self::googleSearchForm();
 		$html .= '</body></html>';
 		echo $html;
 	}
-
-	/**
-	 * @return string
-	 */
-	private static function googleSearchForm() {
-		global $wgSitename, $wgCanonicalServer, $wgRequest;
-
-		$usegoogle = htmlspecialchars( self::msg(
-			'dberr-usegoogle',
-			'You can try searching via Google in the meantime.'
-		) );
-		$outofdate = htmlspecialchars( self::msg(
-			'dberr-outofdate',
-			'Note that their indexes of our content may be out of date.'
-		) );
-		$googlesearch = htmlspecialchars( self::msg( 'searchbutton', 'Search' ) );
-		$search = htmlspecialchars( $wgRequest->getVal( 'search' ) );
-		$server = htmlspecialchars( $wgCanonicalServer );
-		$sitename = htmlspecialchars( $wgSitename );
-		$trygoogle = <<<EOT
-<div style="margin: 1.5em">$usegoogle<br />
-<small>$outofdate</small>
-</div>
-<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" />
-	<input type="hidden" name="oe" value="UTF-8" />
-	<input type="text" name="q" size="31" maxlength="255" value="$search" />
-	<input type="submit" name="btnG" value="$googlesearch" />
-	<p>
-		<label><input type="radio" name="sitesearch" value="$server" checked="checked" />$sitename</label>
-		<label><input type="radio" name="sitesearch" value="" />WWW</label>
-	</p>
-</form>
-EOT;
-		return $trygoogle;
-	}
 }
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 7ebdd5bcc1..ded741d796 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4031,9 +4031,6 @@
 	"dberr-again": "Try waiting a few minutes and reloading.",
 	"dberr-info": "(Cannot access the database: $1)",
 	"dberr-info-hidden": "(Cannot access the database)",
-	"dberr-usegoogle": "You can try searching via Google in the meantime.",
-	"dberr-outofdate": "Note that their indexes of our content may be out of date.",
-	"dberr-cachederror": "This is a cached copy of the requested page, and may not be up to date.",
 	"htmlform-invalid-input": "There are problems with some of your input.",
 	"htmlform-select-badoption": "The value you specified is not a valid option.",
 	"htmlform-int-invalid": "The value you specified is not an integer.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 0067c8f80f..70582784d8 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -4228,9 +4228,6 @@
 	"dberr-again": "This message does not allow any wiki nor html markup.",
 	"dberr-info": "This message does not allow any wiki nor html markup. Parameters:\n* $1 - database server name\nSee also:\n* {{msg-mw|Dberr-info-hidden}} - hides database server name",
 	"dberr-info-hidden": "This message does not allow any wiki nor html markup.\n\nSee also:\n* {{msg-mw|Dberr-info}} - shows database server name",
-	"dberr-usegoogle": "This message does not allow any wiki nor html markup.",
-	"dberr-outofdate": "{{doc-singularthey}}\nIn this sentence, '''their''' indexes refers to '''Google's''' indexes. This message does not allow any wiki nor html markup.",
-	"dberr-cachederror": "Used as error message at the bottom of the page.",
 	"htmlform-invalid-input": "Used as error message in HTML forms.\n\n* {{msg-mw|Htmlform-required}}\n* {{msg-mw|Htmlform-float-invalid}}\n* {{msg-mw|Htmlform-int-invalid}}\n* {{msg-mw|Htmlform-int-toolow}}\n* {{msg-mw|Htmlform-int-toohigh}}\n* {{msg-mw|Htmlform-select-badoption}}",
 	"htmlform-select-badoption": "Used as error message in HTML forms.\n\n* {{msg-mw|Htmlform-invalid-input}}\n* {{msg-mw|Htmlform-required}}\n* {{msg-mw|Htmlform-float-invalid}}\n* {{msg-mw|Htmlform-int-invalid}}\n* {{msg-mw|Htmlform-int-toolow}}\n* {{msg-mw|Htmlform-int-toohigh}}",
 	"htmlform-int-invalid": "Used as error message in HTML forms.\n\n* {{msg-mw|Htmlform-invalid-input}}\n* {{msg-mw|Htmlform-required}}\n* {{msg-mw|Htmlform-float-invalid}}\n* {{msg-mw|Htmlform-int-toolow}}\n* {{msg-mw|Htmlform-int-toohigh}}\n* {{msg-mw|Htmlform-select-badoption}}",