From 56995ae2e7d9a6d3079a1fa73b08e9d28a6bb3b2 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 11 Sep 2015 11:43:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20html-=D1=87?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=B8=20=D1=81=D1=82=D0=B0=D1=82=D1=8C=D0=B8?=
 =?UTF-8?q?,=20=D0=B0=20=D0=BD=D0=B5=D1=82=20txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/controllers/JsonController.php | 4 ++--
 ground/controllers/PageController.php | 6 ++----
 ground/views/article.php              | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ground/controllers/JsonController.php b/ground/controllers/JsonController.php
index 6d51054..15765df 100644
--- a/ground/controllers/JsonController.php
+++ b/ground/controllers/JsonController.php
@@ -429,7 +429,7 @@ class JsonController extends Controller
 			}
 			self::renderPartial('modals/article.php', array(
 				'title' => $article->title,
-				'text' => $article->text,
+				'text' => $article->html,
 			));
 		}
 	}
@@ -443,7 +443,7 @@ class JsonController extends Controller
 		}
 		self::renderPartial('modals/pointAgreement.php', array(
 			'title' => $article->title,
-			'text' => $article->text,
+			'text' => $article->html,
 		));
 	}
 
diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php
index 79c6d6d..0947849 100644
--- a/ground/controllers/PageController.php
+++ b/ground/controllers/PageController.php
@@ -193,10 +193,8 @@ class PageController extends Controller
 			}
 
 			App::setConfig('title', $article->title . ' - wikipoints.ru');
-			$article->text = Helper::replaceLinks($article->text, 'html');
-			$article->text = Helper::replaceImgs($article->text, 'html');
-			$article->text = Markdown::processing($article->text);
-			$article->text = nl2br($article->text);
+			$article->html = Helper::replaceLinks($article->html, 'html');
+			$article->html = Helper::replaceImgs($article->html, 'html');
 
 			self::render('article.php', array(
 				'article' => $article,
diff --git a/ground/views/article.php b/ground/views/article.php
index 66b1b0e..e166354 100644
--- a/ground/views/article.php
+++ b/ground/views/article.php
@@ -8,9 +8,7 @@
 			</div>
 
 			<div style="text-align: justify;">
-				<?php
-				print $article->text;
-				?>
+				<?= $article->html; ?>
 			</div>
 
 		</div>