diff --git a/module/common/model.php b/module/common/model.php index 779d3dfeef..525876f09e 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2425,6 +2425,29 @@ EOD; return $menu; } + + /** + * Process markdown. + * + * @param string $markdown + * @static + * @access public + * @return string + */ + static public function processMarkdown($markdown) + { + if(empty($markdown)) return false; + + $markdown = str_replace('&', '&', $markdown); + + global $app; + $hyperdown = $app->loadClass('hyperdown'); + $content = $hyperdown->makeHtml($markdown); + + $content = htmlspecialchars_decode($content); + $content = fixer::stripDataTags($content); + return $content; + } } class common extends commonModel diff --git a/module/doc/control.php b/module/doc/control.php index 71dd449b7a..550a0bb9c6 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -487,8 +487,8 @@ class doc extends control if($doc->contentType == 'markdown') { - $doc->content = $this->doc->processMarkdown($doc->content); - $doc->digest = $this->doc->processMarkdown($doc->digest); + $doc->content = commonModel::processMarkdown($doc->content); + $doc->digest = commonModel::processMarkdown($doc->digest); } /* Check priv when lib is product or project. */ @@ -916,8 +916,8 @@ class doc extends control if($doc->contentType == 'markdown') { - $doc->content = $this->doc->processMarkdown($doc->content); - $doc->digest = $this->doc->processMarkdown($doc->digest); + $doc->content = commonModel::processMarkdown($doc->content); + $doc->digest = commonModel::processMarkdown($doc->digest); } } diff --git a/module/doc/model.php b/module/doc/model.php index 942516d49f..1df41ba395 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1947,25 +1947,4 @@ class docModel extends model if(!isset($treeMenu[$module->parent])) $treeMenu[$module->parent] = ''; $treeMenu[$module->parent] .= 'id] ? ' class="closed"' : '') . '>' . $li . ''; } - - /** - * Process markdown. - * - * @param string $markdown - * @access public - * @return string - */ - public function processMarkdown($markdown) - { - if(empty($markdown)) return false; - - $markdown = str_replace('&', '&', $markdown); - - $hyperdown = $this->app->loadClass('hyperdown'); - $content = $hyperdown->makeHtml($markdown); - - $content = htmlspecialchars_decode($content); - $content = fixer::stripDataTags($content); - return $content; - } }