From f4a9164e7808abb0e67f669cd165dd7bb566f539 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 17 Jul 2007 17:45:02 +0000
Subject: [PATCH] bug 10594 -- @import needs to be at the start of the <style>
 due to anal spec

---
 SyntaxHighlight_GeSHi.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index c3949422..4ac274a1 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -130,13 +130,16 @@ class SyntaxHighlight_GeSHi {
 		$css[] = ".source-$lang {line-height: normal;}";
 		$css[] = ".source-$lang li {line-height: normal;}";
 		$css[] = $geshi->get_stylesheet( false );
+		$css[] = '/*]]>*/';
+		$css[] = '</style>';
 		if( $wgUseSiteCss ) {
 			$title = Title::makeTitle( NS_MEDIAWIKI, 'Geshi.css' );
 			$q = "usemsgcache=yes&action=raw&ctype=text/css&smaxage={$wgSquidMaxage}";
+			$css[] = '<style type="text/css">/*<![CDATA[*/';
 			$css[] = '@import "' . $title->getLocalUrl( $q ) . '";';
+			$css[] = '/*]]>*/';
+			$css[] = '</style>';
 		}
-		$css[] = '/*]]>*/';
-		$css[] = '</style>';
 		return implode( "\n", $css );
 	}