Merge branch 'master' into pocorate

2 files changed, 3 insertions, 4 deletions

diff --git a/mod/connedit.php b/mod/connedit.php
index 3f610154c..1a00e854c 100644
--- a/mod/connedit.php
+++ b/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;
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;