Merge https://github.com/friendica/red into pending_merge

4 files changed, 4 insertions, 6 deletions

diff --git a/doc/sv/roles.bb b/doc/sv/roles.md
index 47147c6bf..47147c6bf 100644
--- a/doc/sv/roles.bb
+++ b/doc/sv/roles.md
diff --git a/mod/tagger.php b/mod/tagger.php
index a93609c3c..aafad58cf 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -12,11 +12,9 @@ function tagger_content(&$a) {
 	}
 
 	$observer_hash = get_observer_hash();
-
+	//strip html-tags
 	$term = notags(trim($_GET['term']));
-	// no commas allowed
-	$term = str_replace(array(',',' '),array('','_'),$term);
-
+	//check if empty
 	if(! $term)
 		return;
 
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 86847cb35..b93cc16b3 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -77,7 +77,7 @@ function editor_replace(item) {
 	// 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).
 	if(id.length > 16) 
 		id = item.id.substring(0,16);
-	return '$1$2'+item.nick.replace(' ','') + '+' + id;
+	return '$1$2'+item.nick.replace(' ','') + '+' + id + ' ';
 }
 
 function basic_replace(item) {
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index a4717415e..2479068f3 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -41,7 +41,7 @@
 
 {{if $catsenabled}}
 <div id="event-category-wrap">
-	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" />
+	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="tagsinput"  />
 </div>
 {{/if}}