Merge branch 'master' into pocorate

This commit is contained in:
friendica
2015-01-29 15:21:19 -08:00
5 changed files with 5 additions and 6 deletions

View File

@@ -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;

View File

@@ -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;