From df18afd51930c3a89896cc8c8715df09ae8aa7b9 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <krivchikovda@gmail.com>
Date: Sun, 16 Nov 2014 17:03:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BA?=
 =?UTF-8?q?=D1=83=20-=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BF=D0=B8=D1=81=D0=B0=D1=82=D1=8C?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20=D1=81=D1=81=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/classes/Helper.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ground/classes/Helper.php b/ground/classes/Helper.php
index d61690b..04ef134 100644
--- a/ground/classes/Helper.php
+++ b/ground/classes/Helper.php
@@ -9,13 +9,17 @@ class Helper
 
 	public static function replaceLinks($string, $linkTemplate = '/page/point/id/')
 	{
-		preg_match_all("(\[#\d*\])", $string, $links);
+		preg_match_all("(\[#(\d+)>?(.*?)\])", $string, $links);
 		$links = isset($links[0]) ? $links[0] : FALSE;
 		if ($links)
 		{
 			foreach ($links as $link)
 			{
-				$linkId =  (int)mb_substr($link, 2, -1);
+				$idAndLink =  mb_substr($link, 2, -1);
+				$idAndLink = explode('>', $idAndLink);
+
+				$linkId = $idAndLink[0];
+				$linkName = isset($idAndLink[1])?$idAndLink[1]:'<span class="glyphicon glyphicon-link"></span>';
 
 				if ($linkId)
 				{
@@ -23,7 +27,7 @@ class Helper
 					if ($linkPoint->id)
 					{
 						$linkPoint->name = str_replace('"', 'ʺ', $linkPoint->name);
-						$string = str_replace($link, '[<a href="'.$linkTemplate.$linkId.'" title="'.$linkPoint->name.'"><span class="glyphicon glyphicon-link"></span></a>]', $string);
+						$string = str_replace($link, '<a href="'.$linkTemplate.$linkId.'" title="'.$linkPoint->name.'">'.$linkName.'</a>', $string);
 					}
 				}
 			}