From d891b09b225c23da7e99b2f3426f44bf5f45d343 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 10 Sep 2014 01:27:52 -0700
Subject: don't include plus-sign in the stored term for imported mentions

---
 include/diaspora.php | 4 +++-
 version.inc          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index afb318b05..30e79c5c5 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -867,11 +867,13 @@ function diaspora_post($importer,$xml,$msg) {
 	$cnt = preg_match_all('/@\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$body,$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $mtch) {
+			// don't include plustags in the term
+			$term = ((substr($mtch[2],-1,1) === '+') ? substr($mtch[2],0,-1) : $mtch[2]);
 			$datarray['term'][] = array(
 				'uid'   => $importer['channel_id'],
 				'type'  => TERM_MENTION,
 				'otype' => TERM_OBJ_POST,
-				'term'  => $mtch[2],
+				'term'  => $term,
 				'url'   => $mtch[1]
 			);
 		}
diff --git a/version.inc b/version.inc
index 8bfa1e0be..2b982ae7e 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-09.793
+2014-09-10.794
-- 
cgit v1.2.3