ouyang/typecho
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix markdown

Browse Source
This commit is contained in:
joyqi
2014-02-21 00:03:30 +08:00
parent 7ac6ca5546
commit b4d1a3a067
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
var/MarkdownExtraExtended.php
+4 -9
View File
@@ -354,8 +354,8 @@ class Markdown {
}
protected function _hashHTMLBlocks_callback($matches) {
$text = $matches[1];
$key = $this->hashBlock($text);
return "\n\n$key\n\n";
return $this->hashBlock($text);
// return "\n\n$key\n\n";
}
@@ -947,7 +947,7 @@ class Markdown {
return $text;
}
protected function _doCodeBlocks_callback($matches) {
$codeblock = $this->unhashHTMLBlocks($matches[1]);
$codeblock = $this->unhash($matches[1]);
$codeblock = $this->outdent($codeblock);
$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
@@ -1549,11 +1549,6 @@ class Markdown {
protected function _unhash_callback($matches) {
return $this->html_hashes[trim($matches[0])];
}
protected function unhashHTMLBlocks($text) {
return preg_replace_callback("/\n\n(.)\\x1A[0-9]+\\1\n\n/",
array($this, '_unhash_callback'), $text);
}
}
#
@@ -3240,7 +3235,7 @@ class MarkdownExtraExtended extends MarkdownExtra {
}
public function _doFencedCodeBlocks_callback($matches) {
$codeblock = $this->unhashHTMLBlocks($matches[4]);
$codeblock = $this->unhash($matches[4]);
$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
$codeblock = preg_replace_callback('/^\n+/',
array($this, '_doFencedCodeBlocks_newlines'), $codeblock);