All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

добавлена markdown-процессинг текста при выводе точки

This commit is contained in:
Krivchikov Dmitry 2016-04-19 23:56:03 +03:00
parent 946ed45a45
commit c1bfd7def6
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/Markdown.php
View File

@ -3,6 +3,11 @@
class Markdown class Markdown
{ {
/**
* Польная обработка разметки (включая заголовки)
* @param string $string исходная строка
* @return string результат
*/
static function processing($string) static function processing($string)
{ {
$string = self::replaceHeaders($string); $string = self::replaceHeaders($string);
@ -15,6 +20,11 @@ class Markdown
return $string; return $string;
} }
/**
* Обработка разметки без учёта заголовков
* @param string $string исходная строка
* @return string результат
*/
static function liteProcessing($string) static function liteProcessing($string)
{ {
// $string = self::replaceHeaders($string); // $string = self::replaceHeaders($string);
@ -90,6 +100,11 @@ class Markdown
return $string; return $string;
} }
/**
* Срочно написать описание!
* @param type $string
* @return type
*/
static function getClear($string) static function getClear($string)
{ {
// Headers // Headers

3
controllers/JsonController.php
View File

@ -53,7 +53,8 @@ class JsonController extends Controller
if ($id) { if ($id) {
$point = Point::model()->getByPK($id); $point = Point::model()->getByPK($id);
$point->descriptionHtml = nl2br($point->description); $point->descriptionHtml = Markdown::liteProcessing($point->description);
$point->descriptionHtml = nl2br($point->descriptionHtml);
$point->descriptionHtml = Helper::replaceLinks($point->descriptionHtml, 'js'); $point->descriptionHtml = Helper::replaceLinks($point->descriptionHtml, 'js');
$point->name = htmlspecialchars($point->name); $point->name = htmlspecialchars($point->name);
$imgs = $point->photos; $imgs = $point->photos;