diff --git a/include/text.php b/include/text.php
index ba6c2531fb..a9763fd211 100644
--- a/include/text.php
+++ b/include/text.php
@@ -787,6 +787,15 @@ function prepare_body($item,$attach = false) {
$s .= '
';
}
+ $arr = explode(',',$item['tag']);
+ if(count($arr)) {
+ $s .= '';
+ foreach($arr as $r) {
+ $s .= bbcode($r) . ' ';
+ }
+ $s .= '
';
+ }
+
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body_final', $prep_arr);
return $prep_arr['html'];
diff --git a/mod/tagger.php b/mod/tagger.php
index 4127aaadde..7114ed0ce8 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -11,7 +11,9 @@ function tagger_content(&$a) {
return;
}
- $term= notags(trim($_GET['term']));
+ $term = notags(trim($_GET['term']));
+ // no commas allowed
+ $term = str_replace(',','',$term);
if(! $term)
return;