From 5dfa1034c1efbb52c87340a46b85399ce4f38156 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Tue, 6 Mar 2012 22:35:40 +0000
Subject: [PATCH] [SyntaxHighlight GeSHi] Use <code> and <pre> instead of
 <span> and <div> to allow skins to universally style these without requiring
 local wikis to manually maintain a copy of each skins's <pre> style and apply
 it to .mw-geshi

* Fixes
-- (bug 19416) GeSHi-generated blocks should use <pre> style for the container
---
 SyntaxHighlight_GeSHi.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index a6f7cee4..9f46adf3 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -108,7 +108,7 @@ class SyntaxHighlight_GeSHi {
 			$parser->getOutput()->addModuleStyles( 'ext.geshi.local' );
 		}
 
-		$encloseTag = $enclose === GESHI_HEADER_NONE ? 'span' : 'div';
+		$encloseTag = $enclose === GESHI_HEADER_NONE ? 'code' : 'pre';
 		$attribs = Sanitizer::validateTagAttributes( $args, $encloseTag );
 
 		//lang is valid in HTML context, but also used on GeSHi