From fcaf71691f7721265029df04f8052e080a9ae168 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 24 Feb 2015 00:12:30 +0100 Subject: [PATCH] Diaspora: Bugfix for the hashtag detection of incoming posts --- include/diaspora.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index a0d1fcd75..d464b5d67 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -834,6 +834,7 @@ function diaspora_post($importer,$xml,$msg) { $str_tags = ''; $tags = get_tags($body); + rsort($tags); if(count($tags)) { foreach($tags as $tag) { @@ -843,9 +844,9 @@ function diaspora_post($importer,$xml,$msg) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) + if(preg_match('/\[(\S*?)' . preg_quote($tag,'/') . '(\S*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) + if(preg_match('/\[(\S*?)\]\((\S*?)' . preg_quote($tag,'/') . '(\S*?)\)/',$body)) continue; $basetag = str_replace('_',' ',substr($tag,1));