diff --git a/system/admin/editor/js/Markdown.Editor.js b/system/admin/editor/js/Markdown.Editor.js index 57fdd556..a362c28d 100644 --- a/system/admin/editor/js/Markdown.Editor.js +++ b/system/admin/editor/js/Markdown.Editor.js @@ -24,7 +24,7 @@ italic: "Emphasis Ctrl+I", italicexample: "emphasized text", - strikethrough: "Strikethrough Ctrl+X", + strikethrough: "Strikethrough ", strikethroughexample: "strikethrough text", link: "Hyperlink Ctrl+L", @@ -54,8 +54,8 @@ table: "Table - Ctrl+J", - undo: "Undo - Ctrl+Z", - redo: "Redo - Ctrl+Y", + undo: "Undo", + redo: "Redo", redomac: "Redo - Ctrl+Shift+Z", help: "Markdown Editing Help" diff --git a/system/includes/functions.php b/system/includes/functions.php index 806273b5..bd435603 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -200,7 +200,7 @@ function rebuilt_cache($type) if (is_array($tmp)) { foreach ($tmp as $file) { if(strpos($file, '/draft/') === false) { - $posts_cache_sorted[] = pathinfo($file); + $posts_cache_sorted[] = array_merge(pathinfo($file), ['content' => preg_replace('/\s+/', '', (file_get_contents($file)))]); } } } @@ -967,7 +967,7 @@ function get_keyword($keyword, $page, $perpage) foreach ($posts as $index => $v) { $arr = explode('_', $v['basename']); - $filter = $arr[1] . ' ' . $arr[2]; + $filter = $arr[1] . ' ' . $arr[2] . ' ' . $v['content']; foreach ($words as $word) { if (stripos($filter, $word) !== false) { if (!in_array($v, $tmp)) { @@ -1158,7 +1158,7 @@ function keyword_count($keyword) foreach ($posts as $index => $v) { $arr = explode('_', $v['basename']); - $filter = $arr[1] . ' ' . $arr[2]; + $filter = $arr[1] . ' ' . $arr[2] . ' ' . $v['content']; foreach ($words as $word) { if (stripos($filter, $word) !== false) { $tmp[] = $v;