13a14,15
> include_once 'highlight_helper.php';
> include_once 'wp-syntax/geshi/geshi.php';
1050c1052,1063
< 			array(&$this, '_doCodeBlocks_callback'), $text);
---
>            array(&$this, '_doCodeBlocks_highlight_callback'), $text);
> 
> 		$text = preg_replace_callback('{
> 				(?:\n\n|\A)
> 				( # $1 = the code block -- one or more lines, starting with a space/tab
> 				  (?>
> 					\>\s # Lines starting with "> " are code
> 					.*\n+
> 				  )+
> 				)
> 			}xm',
>            array(&$this, '_doCodeBlocks_highlight_literate'), $text);
1065a1079,1111
> 	function _doCodeBlocks_highlight_callback($matches) {
> 		$codeblock = $matches[1];
> 
> 		$codeblock = $this->outdent($codeblock);
> 
> 		# trim leading newlines and trailing whitespace
> 		$codeblock = preg_replace(array('/\A\n+/', '/\s+\z/'), '', $codeblock);
> 
> 		$codeblock = preg_replace_callback('/^(\{\{lang:([\w]+)\}\}\n|)(.*?)$/s', 
> 		create_function('$matches', '
> 		return highlight_src($matches[3], empty($matches[2]) ? "txt" : $matches[2]);
> 		'), $codeblock);
> 
> 		return "\n\n<div>\n".$this->hashBlock($codeblock)."\n</div>\n\n";
> 	}
> 	function _doCodeBlocks_highlight_literate($matches) {
> 		$codeblock = $matches[1];
> 
> 		# trim leading newlines and trailing whitespace
> 		$codeblock = preg_replace(array('/\A\n+/', '/\s+\z/'), '', $codeblock);
> 
> 		# Remove leadin '> ' from every line
> 		#$codeblock = preg_replace('/^\> /', '', $codeblock);
> 
> 		$codeblock = highlight_src($codeblock, "haskell");
> 
> 		# $codeblock = preg_replace_callback('/^(\{\{lang:([\w]+)\}\}\n|)(.*?)$/s', 
> #		create_function('$matches', '
> #		return highlight_src($matches[3], empty($matches[2]) ? "txt" : $matches[2]);
> #		'), $codeblock);
> 
> 		return "\n\n<div>\n".$this->hashBlock($codeblock)."\n</div>\n\n";
> 	}
2636c2682
< ?>
\ No newline at end of file
---
> ?>