Merge branch 'master' into extra

This commit is contained in:
Michel Fortin 2007-09-02 16:57:43 -04:00
commit 5a6f7922d2

View file

@ -1060,7 +1060,7 @@ class Markdown_Parser {
# 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";
}