Merge remote branch 'upstream/master'

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
old mode 100644 (file)
new mode 100755 (executable)
index 4127aaa..3ff5d57
--- 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(array(',',' '),array('','_'),$term);
 
        if(! $term)
                return;
@@ -103,7 +105,7 @@ EOT;
        if(! isset($bodyverb))
                        return; 
 
-       $termlink = '#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]';
+       $termlink = html_entity_decode('⌗') . '[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]';
 
        $arr = array();
 
@@ -132,6 +134,7 @@ EOT;
        $arr['target'] = $target;
        $arr['object-type'] = $objtype;
        $arr['object'] = $obj;
+       $arr['private'] = $item['private'];
        $arr['allow_cid'] = $item['allow_cid'];
        $arr['allow_gid'] = $item['allow_gid'];
        $arr['deny_cid'] = $item['deny_cid'];