mirrors
/
sakura
mirror of https://github.com/mashirozx/sakura.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #236 from mashirozx/issue-235 

Issue 230 234 235
pull/240/head
Spirit 2020-08-03 23:08:08 +08:00 committed by GitHub
parent 9d5e0a598b c9a041eee3
commit f829ab4b60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
functions.php
View File

@ -1817,6 +1817,7 @@ function markdown_parser($incoming_comment)
return $incoming_comment; return $incoming_comment;
} }
add_filter('preprocess_comment', 'markdown_parser'); add_filter('preprocess_comment', 'markdown_parser');
remove_filter( 'comment_text', 'make_clickable', 9 );
//保存Markdown评论 //保存Markdown评论
function save_markdown_comment($comment_ID, $comment_approved) function save_markdown_comment($comment_ID, $comment_approved)

27
inc/Parsedown.php
View File

@ -17,7 +17,7 @@ class Parsedown
{ {
# ~ # ~
const version = '1.7.3'; const version = '1.7.4';
# ~ # ~
@ -1489,22 +1489,41 @@ class Parsedown
} }
} }
$permitRawHtml = false;
if (isset($Element['text'])) if (isset($Element['text']))
{
$text = $Element['text'];
}
// very strongly consider an alternative if you're writing an
// extension
elseif (isset($Element['rawHtml']))
{
$text = $Element['rawHtml'];
$allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
$permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
}
if (isset($text))
{ {
$markup .= '>'; $markup .= '>';
if (!isset($Element['nonNestables'])) if (!isset($Element['nonNestables']))
{ {
$Element['nonNestables'] = array(); $Element['nonNestables'] = array();
} }
if (isset($Element['handler'])) if (isset($Element['handler']))
{ {
$markup .= $this->{$Element['handler']}($Element['text'], $Element['nonNestables']); $markup .= $this->{$Element['handler']}($text, $Element['nonNestables']);
}
elseif (!$permitRawHtml)
{
$markup .= self::escape($text, true);
} }
else else
{ {
$markup .= self::escape($Element['text'], true); $markup .= $text;
} }
$markup .= '</'.$Element['name'].'>'; $markup .= '</'.$Element['name'].'>';

2
inc/classes/Images.php
View File

@ -154,7 +154,7 @@ class Images
$img_array = json_decode($sakura_image_array, true); $img_array = json_decode($sakura_image_array, true);
$img = array_rand($img_array); $img = array_rand($img_array);
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri(); $img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri();
if (strpos($_SERVER['HTTP_ACCEPT'], 'image/webp')) { if (strpos($_SERVER['HTTP_ACCEPT'], 'image/webp') !== false) {
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0]; $imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0];
} else { } else {
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0]; $imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0];

2
js/sakura-app.js
View File

@ -146,7 +146,7 @@ function code_highlight_style() {
} }
var ele_name = $('pre:eq(' + i + ')')[0].children[0].className; var ele_name = $('pre:eq(' + i + ')')[0].children[0].className;
var lang = ele_name.substr(0, ele_name.indexOf(" ")).replace('language-', ''); var lang = ele_name.substr(0, ele_name.indexOf(" ")).replace('language-', '');
if (lang.toLowerCase() == "hljs") var lang = "text"; if (lang.toLowerCase() == "hljs") var lang = $('pre:eq(' + i + ') code').attr("class").replace('hljs', '')?$('pre:eq(' + i + ') code').attr("class").replace('hljs', ''):"text";
$('pre:eq(' + i + ')').addClass('highlight-wrap'); $('pre:eq(' + i + ')').addClass('highlight-wrap');
for (var t in attributes) { for (var t in attributes) {
$('pre:eq(' + i + ')').attr(t, attributes[t]); $('pre:eq(' + i + ')').attr(t, attributes[t]);