Merge branch 'master' into pocorate

mod/connedit.php

@@ -564,6 +564,7 @@ function connedit_content(&$a) {
 		}
 
 		$poco_rating = get_config('system','poco_rating_enable');
+		$poco_rating = 0; // leave disabled until we're ready for it. 
 		// if unset default to enabled
 		if($poco_rating === false)
 			$poco_rating = true;

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;
 

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) {

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}}