From d61aa7897c957fb1604479bc8b2276dcc11ad729 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Mon, 21 Mar 2016 00:36:46 +0300
Subject: [PATCH] =?UTF-8?q?FIX=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=BE=D1=87=D0=BA=D1=83=20=D0=B2=20=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Helper.php                | 10 +++++++++-
 controllers/ArticleController.php |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/classes/Helper.php b/classes/Helper.php
index 12f8d5b..9c749a3 100644
--- a/classes/Helper.php
+++ b/classes/Helper.php
@@ -9,7 +9,7 @@ class Helper
 	}
 
 	/**
-	 * TYPES: 'clear','html','js'
+	 * TYPES: 'clear','html', 'editor','js'
 	 * @param type $string
 	 * @param type $replaceType
 	 * @return type
@@ -34,14 +34,22 @@ class Helper
 
 						switch ($replaceType) {
 							case 'html':
+								// Используется при отображении страницы точки или статьи
 								$linkName = $linkName ? $linkName : '<span class="glyphicon glyphicon-link"></span>';
 								$string = str_replace($link, '<a href="/point/' . $linkId . '" title="' . $linkTitle . '">' . $linkName . '</a>', $string);
 								break;
+							case 'editor':
+								// Используется при редактировании статьи
+								$linkName = $linkName ? $linkName : '<span class="glyphicon glyphicon-link"></span>';
+								$string = str_replace($link, '<a href="/point/' . $linkId . '" title="' . $linkTitle . '" target="_blank">' . $linkName . '</a>', $string);
+								break;
 							case 'js':
+								// Используется при показе описания описания точки НА КАРТЕ
 								$linkName = $linkName ? $linkName : '<span class="glyphicon glyphicon-link"></span>';
 								$string = str_replace($link, '<a href="/?point=' . $linkId . '" title="' . $linkTitle . '">' . $linkName . '</a>', $string);
 								break;
 							default:
+								// Для OG и т.п. - без ссылок
 								$string = str_replace($link, $linkName, $string);
 								break;
 						}
diff --git a/controllers/ArticleController.php b/controllers/ArticleController.php
index 957a5d8..97c6d48 100644
--- a/controllers/ArticleController.php
+++ b/controllers/ArticleController.php
@@ -202,7 +202,7 @@ class ArticleController extends Controller
 			$html = str_replace(array('<','>',"'"), array('&lt;','&gt;','&prime;'), $html);
 			$html = Markdown::processing($html);
 			$html = nl2br($html);
-			$html = Helper::replaceLinks($html, 'html');
+			$html = Helper::replaceLinks($html, 'editor');
 			$html = Helper::replaceImgs($html, 'html', 'small');
 
 			print $html;