From 33917224dc46c26be6b3261f2e91aa12a8b3cc68 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 20 Jan 2010 22:01:37 +0000
Subject: [PATCH] (bug 21870) Remove Google logo loaded from it servers
 (privacy concern). The form is now left as googlesearch message. We should
 probably remove the duplication and load it with wfMsgWeirdKey.

---
 RELEASE-NOTES            | 1 +
 includes/db/Database.php | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a6d71e8675..af2f180cba 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -723,6 +723,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 22096) IE50Fixes.css and IE55Fixes.css have been dropped from the Monobook 
   and Chick skins
 * Fixed bug involving unclosed "-{" markup in the language converter
+* (bug 21870) No longer include Google logo from an external server on wiki error.
 
 == API changes in 1.16 ==
 
diff --git a/includes/db/Database.php b/includes/db/Database.php
index dcda5d8795..32c6ec72d6 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2636,8 +2636,6 @@ class DBConnectionError extends DBError {
     <input type="hidden" name="ie" value="$wgInputEncoding" />
     <input type="hidden" name="oe" value="$wgInputEncoding" />
 
-    <img src="http://www.google.com/logos/Logo_40wht.gif" alt="" style="float:left; margin-left: 1.5em; margin-right: 1.5em;" />
-
     <input type="text" name="q" size="31" maxlength="255" value="$search" />
     <input type="submit" name="btnG" value="$googlesearch" />
   <div>
-- 
2.20.1