Merge a977d2268f into 40181f0de6

system/admin/editor/js/Markdown.Editor.js

@@ -24,7 +24,7 @@
         italic: "Emphasis <em> Ctrl+I",
         italicexample: "emphasized text",
 		
-        strikethrough: "Strikethrough <s> Ctrl+X",
+        strikethrough: "Strikethrough <s>",
         strikethroughexample: "strikethrough text",
 
         link: "Hyperlink <a> 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"

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;