From b4e186f958b17318293bfdab15b7c3191d4c9c75 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <krivchikovda@gmail.com>
Date: Sun, 16 Nov 2014 13:11:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/classes/Helper.php             | 4 ++--
 ground/controllers/JsonController.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ground/classes/Helper.php b/ground/classes/Helper.php
index aa108ab..01b5000 100644
--- a/ground/classes/Helper.php
+++ b/ground/classes/Helper.php
@@ -7,7 +7,7 @@ class Helper
 		return (bool) $var;
 	}
 
-	public static function replaceLinks($string)
+	public static function replaceLinks($string, $linkTemplate = '/page/point/id/')
 	{
 		preg_match_all("(\[#\d*\])", $string, $links);
 		$links = isset($links[0]) ? $links[0] : FALSE;
@@ -23,7 +23,7 @@ class Helper
 					if ($linkPoint->id)
 					{
 						$linkPoint->name = str_replace('"', 'ʺ', $linkPoint->name);
-						$string = str_replace($link, '[<a href="/page/point/id/'.$linkId.'" title="'.$linkPoint->name.'"><span class="glyphicon glyphicon-link"></span></a>]', $string);
+						$string = str_replace($link, '[<a href="'.$linkTemplate.$linkId.'" title="'.$linkPoint->name.'"><span class="glyphicon glyphicon-link"></span></a>]', $string);
 					}
 				}
 			}
diff --git a/ground/controllers/JsonController.php b/ground/controllers/JsonController.php
index af25267..c45bcce 100644
--- a/ground/controllers/JsonController.php
+++ b/ground/controllers/JsonController.php
@@ -40,6 +40,7 @@ class JsonController extends Controller
 			$point = Point::model()->getByPK($id);
 
 			$point->descriptionHtml = nl2br($point->description);
+			$point->descriptionHtml = Helper::replaceLinks($point->descriptionHtml, '/?point=');
 			$point->name = htmlspecialchars($point->name);
 			$imgs = $point->photos;
 			$photosCount = 1;