aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:21:19 -0800
committerfriendica <info@friendica.com>2015-01-29 15:21:19 -0800
commitdf6d54c64ea73bffd0943dfd3d94e8157ec92a75 (patch)
treee0ae971158a2696e20e075b485bc3836d504009f /mod
parentfd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (diff)
parentd7dae3c72a5d22cd29d4ba8cfd18e7139ede09ff (diff)
downloadvolse-hubzilla-df6d54c64ea73bffd0943dfd3d94e8157ec92a75.tar.gz
volse-hubzilla-df6d54c64ea73bffd0943dfd3d94e8157ec92a75.tar.bz2
volse-hubzilla-df6d54c64ea73bffd0943dfd3d94e8157ec92a75.zip
Merge branch 'master' into pocorate
Diffstat (limited to 'mod')
-rw-r--r--mod/connedit.php1
-rw-r--r--mod/tagger.php6
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;