From 68e785a262a0cf62ebe0c78e15b93ef564bfa84f Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 12 Sep 2015 13:16:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A7=D1=83=D1=82=D1=8C=20=D0=B4=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=20=D0=BF=D0=B0=D1=80=D1=81?=
 =?UTF-8?q?=D0=B5=D1=80=20=D1=83=D1=80=D0=BB=D0=BE=D0=B2=20-=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=82=D0=BE=D1=87=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=86=D0=B5=20=D1=83=D1=80=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D1=82=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/classes/Markdown.php    | 2 +-
 ground/views/articles/edit.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ground/classes/Markdown.php b/ground/classes/Markdown.php
index aa4cff1..251067e 100644
--- a/ground/classes/Markdown.php
+++ b/ground/classes/Markdown.php
@@ -57,7 +57,7 @@ class Markdown
 
 	static private function replaceUrls($string)
 	{
-		$pr = '((https{0,1}:\/\/[\da-z\.-]+\.[a-z]{2,6})[\/\w\?=&#%+\.,-]*\/?)';
+		$pr = '((https{0,1}:\/\/[\da-z\.-]+\.[a-z]{2,6})([\/\w\?=&#%+,-]|(\.[^\s]))*\/?)';
 		$rep = '<a href="$0" title="$0" target="_blank">$1</a>';
 		return preg_replace($pr, $rep, $string);
 	}
diff --git a/ground/views/articles/edit.php b/ground/views/articles/edit.php
index 8e283a4..98509fe 100644
--- a/ground/views/articles/edit.php
+++ b/ground/views/articles/edit.php
@@ -71,7 +71,7 @@
 									<textarea name="text" id="articleText" class="form-control"  onscroll="monitor.scrollTop=scrollTop" style="height: 500px; resize: none;" ><?= $article->text ?></textarea>
 								</td>
 								<td style="width: 50%;">
-									<div id="monitor" style="height: 500px; width: 100%; background-color: white; margin-top: 25px; overflow-y: scroll;"></div>
+									<div id="monitor" style="height: 500px; width: 100%; background-color: white; margin-top: 25px; overflow-y: scroll; padding: 5px 10px;"></div>
 								</td>
 							</tr>
 						</table>