Merge branch 'master' into extra

michelf · Sep 2, 2007 · 5a6f792 · 5a6f792
2 parents 03c564f + c4be903
commit 5a6f792
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/markdown.php b/markdown.php
@@ -1060,7 +1060,7 @@ function _doCodeBlocks_callback($matches) {
 		# trim leading newlines and trailing newlines
 		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
 
-		$codeblock = "<pre><code>$codeblock\n</pre></code>";
+		$codeblock = "<pre><code>$codeblock\n</code></pre>";
 		return "\n\n".$this->hashBlock($codeblock)."\n\n";
 	}