From dc95e90c59f581a49dea049e3689281d1e52e521 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Thu, 1 Jul 2010 09:48:53 +0000
Subject: [PATCH] (bug 16886) Sister projects box moves down the extract of the
 first result in IE 7.

---
 RELEASE-NOTES                       |  1 +
 includes/specials/SpecialSearch.php |  5 ++++-
 skins/common/IE70Fixes.css          | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 skins/common/IE70Fixes.css

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ed7f06de7b..4e8d5ab6ce 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -250,6 +250,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 24089) Logevents causes PHP Notice if leprop=title isn't supplied
 * (bug 23473) Give description of properties on all modules
 * (bug 24136) unknownerror when adding new section without summary, but forceditsummary
+* (bug 16886) Sister projects box moves down the extract of the first result in IE 7.
 
 === Languages updated in 1.17 ===
 
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 408371f617..9254098015 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -368,6 +368,9 @@ class SpecialSearch {
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		// add javascript specific to special:search
 		$wgOut->addScriptFile( 'search.js' );
+
+		// Bug #16886: Sister projects box moves down the first extract on IE7  
+		$wgOut->addStyle( 'common/IE80Fixes.css', 'screen', 'IE 7' );
 	}
 
 	/**
@@ -608,7 +611,7 @@ class SpecialSearch {
 		}
 
 		wfProfileOut( __METHOD__ );
-		return "<li>{$link} {$redirect} {$section} {$extract}\n" .
+		return "<li><div class='mw-search-result-heading'>{$link} {$redirect} {$section}</div> {$extract}\n" .
 			"<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
 			"</li>\n";
 
diff --git a/skins/common/IE70Fixes.css b/skins/common/IE70Fixes.css
new file mode 100644
index 0000000000..d9e3ff843c
--- /dev/null
+++ b/skins/common/IE70Fixes.css
@@ -0,0 +1,12 @@
+/**
+ * Fixes sister projects box moving down the extract 
+ * of the first result (bug #16886).
+ * It only happens when the window is small and 
+ * This changes slightly the layout for big screens 
+ * where there was space for the extracts and the 
+ * sister projects and thus it showed like in any 
+ * other browser.
+ */
+.searchresult {
+	display: inline;
+}
-- 
2.20.1