From 5f5750c834702bcc7b31d5fefff0da0350c0afa8 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Fri, 11 Sep 2015 15:23:20 +0300 Subject: [PATCH] =?UTF-8?q?OG=20=D0=B8=20=D1=87=D0=B8=D1=81=D1=82=D1=8B?= =?UTF-8?q?=D0=B9=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20-=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D1=8B=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/classes/Helper.php | 4 ++-- ground/classes/Markdown.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ground/classes/Helper.php b/ground/classes/Helper.php index 7d4c896..abe474f 100644 --- a/ground/classes/Helper.php +++ b/ground/classes/Helper.php @@ -114,7 +114,7 @@ class Helper $og = array(); $og['title'] = str_replace('"', 'ʺ', $point->name) . ' [wikipoints.ru]'; $point->description = str_replace('"', 'ʺ', $point->description); - $og['description'] = mb_substr($point->description, 0, 97, 'UTF-8') . '...'; + $og['description'] = mb_substr($point->description, 0, 99, 'UTF-8') . '…'; $og['site_name'] = 'WikiPoints: Лучшие выходные - это выходные в путешествии!'; $og['type'] = 'website'; $og['url'] = 'http://wikipoints.ru/?point=' . $point->id; @@ -128,7 +128,7 @@ class Helper $og = array(); $og['title'] = str_replace('"', 'ʺ', $article->title) . ' [wikipoints.ru]'; $article->text = Markdown::getClear(str_replace('"', 'ʺ', $article->text)); - $og['description'] = mb_substr($article->text, 0, 97, 'UTF-8') . '...'; + $og['description'] = mb_substr($article->text, 0, 99, 'UTF-8') . '…'; $og['site_name'] = 'WikiPoints: Лучшие выходные - это выходные в путешествии!'; $og['type'] = 'website'; $og['url'] = 'http://wikipoints.ru/page/article/id/' . $article->id; diff --git a/ground/classes/Markdown.php b/ground/classes/Markdown.php index 767ef9a..aa4cff1 100644 --- a/ground/classes/Markdown.php +++ b/ground/classes/Markdown.php @@ -120,6 +120,11 @@ class Markdown $rep = ''; $string = preg_replace($pr, $rep, $string); + // Points + $pr = '((\[#(\d+)[>\|](.*?)\])|(\[#(\d+)\]))'; + $rep = ' '; + $string = preg_replace($pr, $rep, $string); + // multi-space $pr = '(\s{2,})'; $rep = ' ';