From c1bfd7def66d95942dcb64bb5c5873a0eab28af8 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Tue, 19 Apr 2016 23:56:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20markdown-=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?=
 =?UTF-8?q?=D1=81=D0=B8=D0=BD=D0=B3=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B5=20?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Markdown.php           | 15 +++++++++++++++
 controllers/JsonController.php |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/classes/Markdown.php b/classes/Markdown.php
index 3b9c3a5..4d0e9b4 100644
--- a/classes/Markdown.php
+++ b/classes/Markdown.php
@@ -3,6 +3,11 @@
 class Markdown
 {
 
+	/**
+	 * Польная обработка разметки (включая заголовки)
+	 * @param string $string исходная строка
+	 * @return string результат
+	 */
 	static function processing($string)
 	{
 		$string = self::replaceHeaders($string);
@@ -15,6 +20,11 @@ class Markdown
 		return $string;
 	}
 
+	/**
+	 * Обработка разметки без учёта заголовков
+	 * @param string $string исходная строка
+	 * @return string результат
+	 */
 	static function liteProcessing($string)
 	{
 //		$string = self::replaceHeaders($string);
@@ -90,6 +100,11 @@ class Markdown
 		return $string;
 	}
 
+	/**
+	 * Срочно написать описание!
+	 * @param type $string
+	 * @return type
+	 */
 	static function getClear($string)
 	{
 		// Headers
diff --git a/controllers/JsonController.php b/controllers/JsonController.php
index d0c2fe7..6535df9 100644
--- a/controllers/JsonController.php
+++ b/controllers/JsonController.php
@@ -53,7 +53,8 @@ class JsonController extends Controller
 		if ($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->name = htmlspecialchars($point->name);
 			$imgs = $point->photos;